From 64b625f4b2fdb2c873e25c149648b2ce923faab7 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 23 Nov 2012 09:47:15 +0100 Subject: qdev: simplify (de)allocation of buses All conditional deallocation can now be done with object_delete. Remove the @qom_allocated and @glib_allocated fields; replace the latter with a direct assignment of the @free function pointer. Signed-off-by: Paolo Bonzini Signed-off-by: Anthony Liguori --- hw/qdev-core.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'hw/qdev-core.h') diff --git a/hw/qdev-core.h b/hw/qdev-core.h index fce9e2249c..fff7f0f5ab 100644 --- a/hw/qdev-core.h +++ b/hw/qdev-core.h @@ -106,17 +106,12 @@ typedef struct BusChild { /** * BusState: - * @qom_allocated: Indicates whether the object was allocated by QOM. - * @glib_allocated: Indicates whether the object was initialized in-place - * yet is expected to be freed with g_free(). */ struct BusState { Object obj; DeviceState *parent; const char *name; int allow_hotplug; - bool qom_allocated; - bool glib_allocated; int max_index; QTAILQ_HEAD(ChildrenHead, BusChild) children; QLIST_ENTRY(BusState) sibling; -- cgit 1.4.1