From a1e7efdcef38f7cba4a46e836f433c73d45d926f Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 3 Feb 2012 15:59:53 +0100 Subject: qom: fix canonical paths vs. interfaces Reviewed-by: Anthony Liguori Signed-off-by: Paolo Bonzini --- qom/object.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'qom') 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; -- cgit v1.2.3