diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-11-23 09:47:12 +0100 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2012-12-03 15:02:28 -0600 |
| commit | f05a3da4e00d24c4540811e6fff2c4f0484771bd (patch) | |
| tree | eb9563ff1e5287a0b7e2fbe62542cd7ab7acbdb5 | |
| parent | 0aad8f1a49fe49b15858978a03b4adead669ff6d (diff) | |
| download | qemu-f05a3da4e00d24c4540811e6fff2c4f0484771bd.tar.gz | |
qom: fix refcount of non-heap-allocated objects
The reference count for embedded objects is always one too low, because
object_initialize_with_type returns with zero references to the object.
This causes premature finalization of the object (or an assertion failure)
after calling object_ref to add an extra reference and object_unref to
remove it.
The fix is to move the initial object_ref call from object_new_with_type
to object_initialize_with_type.
Acked-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 764b63125a77dab54ed405d493452a4e05679c2e)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | qom/object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qom/object.c b/qom/object.c index f33e84da7d..549931809b 100644 --- a/qom/object.c +++ b/qom/object.c @@ -307,6 +307,7 @@ void object_initialize_with_type(void *data, TypeImpl *type) memset(obj, 0, type->instance_size); obj->class = type->class; + object_ref(obj); QTAILQ_INIT(&obj->properties); object_init_with_type(obj, type); } @@ -395,7 +396,6 @@ Object *object_new_with_type(Type type) obj = g_malloc(type->instance_size); object_initialize_with_type(obj, type); - object_ref(obj); return obj; } |