aboutsummaryrefslogtreecommitdiff
path: root/qom
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-06-11 11:57:38 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2014-08-17 23:25:24 +0200
commitbffc687d66604e68c14f6277b595b33966eb328a (patch)
tree592506a646a96de665751d870b3f80def0d54436 /qom
parent76a6e1cc7cc3ad022e7159b37b291b75bc4615bf (diff)
downloadqemu-bffc687d66604e68c14f6277b595b33966eb328a.zip
qemu-bffc687d66604e68c14f6277b595b33966eb328a.tar.gz
qemu-bffc687d66604e68c14f6277b595b33966eb328a.tar.bz2
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>
Diffstat (limited to 'qom')
-rw-r--r--qom/object.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/qom/object.c b/qom/object.c
index f301bc2..1b00831 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);
}