[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1.3 3/5] qom: make object_delete usable for statical
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 1.3 3/5] qom: make object_delete usable for statically-allocated objects |
Date: |
Fri, 23 Nov 2012 09:47:14 +0100 |
Store in the object the freeing function that will be used at deletion
time. This makes it possible to use object_delete on statically-allocated
(embedded) objects. Dually, it makes it possible to use object_unparent
and object_unref without leaking memory, when the lifetime of object
might extend until after the call to object_delete.
Signed-off-by: Paolo Bonzini <address@hidden>
---
Ping Fan, this is the patch I mentioned at
http://permalink.gmane.org/gmane.comp.emulators.qemu/180054.
With this patch, your call of object_unref for qdev_unplug_complete
will not leak the device anymore (object_finalize will free it
when the last reference is dropped with object_unref).
include/qemu/object.h | 9 +++++++++
qom/object.c | 5 ++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/include/qemu/object.h b/include/qemu/object.h
index 232463b..5ddcb4a 100644
--- a/include/qemu/object.h
+++ b/include/qemu/object.h
@@ -239,6 +239,14 @@ typedef struct ObjectProperty
typedef void (ObjectUnparent)(Object *obj);
/**
+ * ObjectFree:
+ * @obj: the object being freed
+ *
+ * Called when an object's last reference is removed.
+ */
+typedef void (ObjectFree)(void *obj);
+
+/**
* ObjectClass:
*
* The base for all classes. The only thing that #ObjectClass contains is an
@@ -272,6 +280,7 @@ struct Object
{
/*< private >*/
ObjectClass *class;
+ ObjectFree *free;
QTAILQ_HEAD(, ObjectProperty) properties;
uint32_t ref;
Object *parent;
diff --git a/qom/object.c b/qom/object.c
index f4747d0..f3e9517 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -388,6 +388,9 @@ void object_finalize(void *data)
object_property_del_all(obj);
g_assert(obj->ref == 0);
+ if (obj->free) {
+ obj->free(obj);
+ }
}
Object *object_new_with_type(Type type)
@@ -399,6 +402,7 @@ Object *object_new_with_type(Type type)
obj = g_malloc(type->instance_size);
object_initialize_with_type(obj, type);
+ obj->free = g_free;
return obj;
}
@@ -415,7 +419,6 @@ void object_delete(Object *obj)
object_unparent(obj);
g_assert(obj->ref == 1);
object_unref(obj);
- g_free(obj);
}
Object *object_dynamic_cast(Object *obj, const char *typename)
--
1.8.0
- [Qemu-devel] [PATCH 1.3 0/5] QOM/qdev lifetime fixes, Paolo Bonzini, 2012/11/23
- [Qemu-devel] [PATCH 1.3 4/5] qdev: simplify (de)allocation of buses, Paolo Bonzini, 2012/11/23
- [Qemu-devel] [PATCH 1.3 2/5] qdev: move bus removal to object_unparent, Paolo Bonzini, 2012/11/23
- [Qemu-devel] [PATCH 1.3 1/5] qom: fix refcount of non-heap-allocated objects, Paolo Bonzini, 2012/11/23
- [Qemu-devel] [PATCH 1.3 3/5] qom: make object_delete usable for statically-allocated objects,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 1.3 5/5] qom: make object_finalize static, Paolo Bonzini, 2012/11/23
- Re: [Qemu-devel] [PATCH 1.3 0/5] QOM/qdev lifetime fixes, Anthony Liguori, 2012/11/26