aboutsummaryrefslogtreecommitdiffstats
path: root/qom
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-02-03 15:59:53 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2012-02-07 13:52:41 +0100
commita1e7efdcef38f7cba4a46e836f433c73d45d926f (patch)
treedc5ef8cda529b25e24c844b8fff6c64a121f161a /qom
parent11e35bfdc7f030f65844b34239bdde16e68b2468 (diff)
qom: fix canonical paths vs. interfaces
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qom')
-rw-r--r--qom/object.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/qom/object.c b/qom/object.c
index 2bd15b81b..686cca00b 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -805,6 +805,12 @@ void object_property_add_child(Object *obj, const char *name,
{
gchar *type;
+ /* Registering an interface object in the composition tree will mightily
+ * confuse object_get_canonical_path (which, on the other hand, knows how
+ * to get the canonical path of an interface object).
+ */
+ assert(!object_is_type(obj, type_interface));
+
type = g_strdup_printf("child<%s>", object_get_typename(OBJECT(child)));
object_property_add(obj, name, type, object_get_child_property,
@@ -898,6 +904,10 @@ gchar *object_get_canonical_path(Object *obj)
Object *root = object_get_root();
char *newpath = NULL, *path = NULL;
+ if (object_is_type(obj, type_interface)) {
+ obj = INTERFACE(obj)->obj;
+ }
+
while (obj != root) {
ObjectProperty *prop = NULL;