david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qom: fix canonical paths vs. interfaces

Browse Source 
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-02-03 15:59:53 +01:00
parent 11e35bfdc7
commit a1e7efdcef
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qom/object.c
View File

@ -805,6 +805,12 @@ void object_property_add_child(Object *obj, const char *name,
{ {
gchar *type; 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))); type = g_strdup_printf("child<%s>", object_get_typename(OBJECT(child)));
object_property_add(obj, name, type, object_get_child_property, 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(); Object *root = object_get_root();
char *newpath = NULL, *path = NULL; char *newpath = NULL, *path = NULL;
if (object_is_type(obj, type_interface)) {
obj = INTERFACE(obj)->obj;
}
while (obj != root) { while (obj != root) {
ObjectProperty *prop = NULL; ObjectProperty *prop = NULL;