From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 11 Jun 2014 09:57:38 +0000 (+0200)
Subject: qom: object: move unparenting to the child property's release callback
X-Git-Tag: qemu-xen-4.6.0-rc1~256^2~13
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bffc687d66604e68c14f6277b595b33966eb328a;p=qemu-upstream-4.6-testing.git

qom: object: move unparenting to the child property's release callback

This ensures that the unparent callback is called automatically
when the parent object is finalized.

Note that there's no need to keep a reference neither in
object_unparent nor in object_finalize_child_property.  The
reference held by the child property itself will do.

Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/qom/object.c b/qom/object.c
index f301bc2ab..1b00831ef 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -387,19 +387,9 @@ static void object_property_del_child(Object *obj, Object *child, Error **errp)
 
 void object_unparent(Object *obj)
 {
-    if (!obj->parent) {
-        return;
-    }
-
-    object_ref(obj);
-    if (obj->class->unparent) {
-        (obj->class->unparent)(obj);
-    }
     if (obj->parent) {
         object_property_del_child(obj->parent, obj, NULL);
-        obj->parent = NULL;
     }
-    object_unref(obj);
 }
 
 static void object_deinit(Object *obj, TypeImpl *type)
@@ -1042,6 +1032,10 @@ static void object_finalize_child_property(Object *obj, const char *name,
 {
     Object *child = opaque;
 
+    if (child->class->unparent) {
+        (child->class->unparent)(child);
+    }
+    child->parent = NULL;
     object_unref(child);
 }