Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190111-pull-request' into...

[mirror_qemu.git] / qom / container.c

diff --git a/qom/container.c b/qom/container.c
index 67e9e8a6f8923978a53c332ca71eeda572f0efb6..f6ccaf7ea780349e9fac89dea8384cfc0f6fb429 100644 (file)
--- a/qom/container.c
+++ b/qom/container.c
@@ -10,11 +10,11 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include "qemu/object.h"
-#include "module.h"
-#include <assert.h>
+#include "qemu/osdep.h"
+#include "qom/object.h"
+#include "qemu/module.h"
 
-static TypeInfo container_info = {
+static const TypeInfo container_info = {
     .name          = "container",
     .instance_size = sizeof(Object),
     .parent        = TYPE_OBJECT,
@@ -25,7 +25,7 @@ static void container_register_types(void)
     type_register_static(&container_info);
 }
 
-Object *container_get(const char *path)
+Object *container_get(Object *root, const char *path)
 {
     Object *obj, *child;
     gchar **parts;
@@ -33,16 +33,19 @@ Object *container_get(const char *path)
 
     parts = g_strsplit(path, "/", 0);
     assert(parts != NULL && parts[0] != NULL && !parts[0][0]);
-    obj = object_get_root();
+    obj = root;
 
     for (i = 1; parts[i] != NULL; i++, obj = child) {
         child = object_resolve_path_component(obj, parts[i]);
         if (!child) {
             child = object_new("container");
             object_property_add_child(obj, parts[i], child, NULL);
+            object_unref(child);
         }
     }
 
+    g_strfreev(parts);
+
     return obj;
 }