diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2012-08-22 23:09:46 +0200 |
|---|---|---|
| committer |   Michael Roth <mdroth@linux.vnet.ibm.com> | 2012-08-28 01:50:02 -0500 |
| commit | 1d34dff02fad135a64266e670f01ac3c6a408fa1 (patch) | |
| tree | f55ab86fac480c0cdf67690737b89c7de1166375 /qom | |
| parent | monitor: don't try to initialize json parser when monitor is HMP (diff) | |
| download | qemu-kvm-1d34dff02fad135a64266e670f01ac3c6a408fa1.tar.gz qemu-kvm-1d34dff02fad135a64266e670f01ac3c6a408fa1.tar.bz2 qemu-kvm-1d34dff02fad135a64266e670f01ac3c6a408fa1.zip | |
qom: object_delete should unparent the object first
object_deinit is only called when the reference count goes to zero,
and yet tries to do an object_unparent. Now, object_unparent
either does nothing or it will decrease the reference count.
Because we know the reference count is zero, the object_unparent
call in object_deinit is useless.
Instead, we need to disconnect the object from its parent just
before we remove the last reference apart from the parent's. This
happens in object_delete. Once we do this, all calls to
object_unparent peppered through QEMU can go away.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit da5a44e8b0b727681fc33e8d94832d1cae48a788)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'qom')
| -rw-r--r-- | qom/object.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qom/object.c b/qom/object.c index 6f839ad8c..58dd8862e 100644 --- a/qom/object.c +++ b/qom/object.c @@ -347,8 +347,6 @@ static void object_deinit(Object *obj, TypeImpl *type) if (type_has_parent(type)) { object_deinit(obj, type_get_parent(type)); } - - object_unparent(obj); } void object_finalize(void *data) @@ -385,8 +383,9 @@ Object *object_new(const char *typename) void object_delete(Object *obj) { + object_unparent(obj); + g_assert(obj->ref == 1); object_unref(obj); - g_assert(obj->ref == 0); g_free(obj); } |