diff options
| author | Paolo Bonzini | 2012-11-23 09:47:15 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2012-11-26 20:41:00 +0100 |
| commit | 64b625f4b2fdb2c873e25c149648b2ce923faab7 (patch) | |
| tree | c0ecebd3d237877cba1d232454ae5dd43d27b43c /hw/sysbus.c | |
| parent | qom: make object_delete usable for statically-allocated objects (diff) | |
| download | qemu-64b625f4b2fdb2c873e25c149648b2ce923faab7.tar.gz qemu-64b625f4b2fdb2c873e25c149648b2ce923faab7.tar.xz qemu-64b625f4b2fdb2c873e25c149648b2ce923faab7.zip | |
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 <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/sysbus.c')
| -rw-r--r-- | hw/sysbus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/sysbus.c b/hw/sysbus.c index 4969f06a66..ef8ffb6603 100644 --- a/hw/sysbus.c +++ b/hw/sysbus.c @@ -274,7 +274,7 @@ static void main_system_bus_create(void) main_system_bus = g_malloc0(system_bus_info.instance_size); qbus_create_inplace(main_system_bus, TYPE_SYSTEM_BUS, NULL, "main-system-bus"); - main_system_bus->glib_allocated = true; + OBJECT(main_system_bus)->free = g_free; object_property_add_child(container_get(qdev_get_machine(), "/unattached"), "sysbus", OBJECT(main_system_bus), NULL); |