commit dfe47e7029e117f65a14c0948021654f7f7d5d05
author Andreas Färber <afaerber@suse.de> Thu Apr 05 13:21:46 2012 +0200
committer Anthony Liguori <aliguori@us.ibm.com> Tue Apr 24 09:50:31 2012 -0500
tree 9831f047090bf7bb7c58959741aad546221cb862
parent 7f3bf92fad79dff1edcb796a875b5c0d57666162

qom: Refine container_get() to allow using a custom root

Specify the root to search from as argument. This avoids hardcoding
"/machine" in some places and makes it more flexible.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Anthony Liguori <anthony@codemonkey.ws>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

hw/qdev.c

diff --git a/hw/qdev.c b/hw/qdev.c
index afbc975..0bcde20 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -158,8 +158,9 @@
         static int unattached_count = 0;
         gchar *name = g_strdup_printf("device[%d]", unattached_count++);
 
-        object_property_add_child(container_get("/machine/unattached"), name,
-                                  OBJECT(dev), NULL);
+        object_property_add_child(container_get(qdev_get_machine(),
+                                                "/unattached"),
+                                  name, OBJECT(dev), NULL);
         g_free(name);
     }
 
@@ -677,7 +678,7 @@
     static Object *dev;
 
     if (dev == NULL) {
-        dev = container_get("/machine");
+        dev = container_get(object_get_root(), "/machine");
     }
 
     return dev;