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

qom: call class destructor before unparent

Browse Source 
It seems more logical to have destruction flow start with the subclass
and move up to the base class.  This ensures object has a valid
canonical path when destructor is called.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2013-03-18 21:01:37 +02:00
parent 0402a5d65e
commit e998fa8df8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qom/object.c
View File

@ -363,12 +363,12 @@ static void object_property_del_child(Object *obj, Object *child, Error **errp)
void object_unparent(Object *obj) void object_unparent(Object *obj)
{ {
object_ref(obj); object_ref(obj);
if (obj->parent) {
object_property_del_child(obj->parent, obj, NULL);
}
if (obj->class->unparent) { if (obj->class->unparent) {
(obj->class->unparent)(obj); (obj->class->unparent)(obj);
} }
if (obj->parent) {
object_property_del_child(obj->parent, obj, NULL);
}
object_unref(obj); object_unref(obj);
} }