[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/12] qdev-core: isolate reset register/unregister
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 07/12] qdev-core: isolate reset register/unregister code |
Date: |
Tue, 16 Oct 2012 03:57:19 +0200 |
From: Eduardo Habkost <address@hidden>
The reset register/unregister code is specific to qemu-system-*, so
isolate it so it can be moved to qdev-system.c.
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/qdev-core.c | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/hw/qdev-core.c b/hw/qdev-core.c
index af0af52..a105679 100644
--- a/hw/qdev-core.c
+++ b/hw/qdev-core.c
@@ -47,6 +47,21 @@ void GCC_WEAK qdev_finalize_vmstate(DeviceState *dev)
{
}
+static void qbus_register_reset(BusState *bus)
+{
+ if (bus != sysbus_get_default()) {
+ /* TODO: once all bus devices are qdevified,
+ only reset handler for main_system_bus should be registered here. */
+ qemu_register_reset(qbus_reset_all_fn, bus);
+ }
+}
+
+static void qbus_unregister_reset(BusState *bus)
+{
+ assert(bus != sysbus_get_default()); /* main_system_bus is never freed */
+ qemu_unregister_reset(qbus_reset_all_fn, bus);
+}
+
const char *qdev_fw_name(DeviceState *dev)
{
DeviceClass *dc = DEVICE_GET_CLASS(dev);
@@ -355,10 +370,8 @@ static void qbus_realize(BusState *bus)
QLIST_INSERT_HEAD(&bus->parent->child_bus, bus, sibling);
bus->parent->num_child_bus++;
object_property_add_child(OBJECT(bus->parent), bus->name, OBJECT(bus),
NULL);
- } else if (bus != sysbus_get_default()) {
- /* TODO: once all bus devices are qdevified,
- only reset handler for main_system_bus should be registered here. */
- qemu_register_reset(qbus_reset_all_fn, bus);
+ } else {
+ qbus_register_reset(bus);
}
}
@@ -692,8 +705,7 @@ static void qbus_finalize(Object *obj)
QLIST_REMOVE(bus, sibling);
bus->parent->num_child_bus--;
} else {
- assert(bus != sysbus_get_default()); /* main_system_bus is never freed
*/
- qemu_unregister_reset(qbus_reset_all_fn, bus);
+ qbus_unregister_reset(bus);
}
g_free((char *)bus->name);
}
--
1.7.11.7
- [Qemu-devel] [PATCH v3 00/12] make CPU child of DeviceState and include qdev core in *-user, Igor Mammedov, 2012/10/15
- [Qemu-devel] [PATCH 02/12] qapi-types.h doesn't really need to include qemu-common.h, Igor Mammedov, 2012/10/15
- [Qemu-devel] [PATCH 01/12] qdev: split up header so it can be used in cpu.h, Igor Mammedov, 2012/10/15
- [Qemu-devel] [PATCH 03/12] qdev: separate core from the code used only by qemu-system-*, Igor Mammedov, 2012/10/15
- [Qemu-devel] [PATCH 05/12] qdev-core: isolate vmstate handling into separate functions, Igor Mammedov, 2012/10/15
- [Qemu-devel] [PATCH 06/12] qdev: move vmstate handling to qdev-system.c, Igor Mammedov, 2012/10/15
- [Qemu-devel] [PATCH 04/12] qdev: rename qdev.c to qdev-core.c, Igor Mammedov, 2012/10/15
- [Qemu-devel] [PATCH 07/12] qdev-core: isolate reset register/unregister code,
Igor Mammedov <=
- [Qemu-devel] [PATCH 09/12] move qemu_irq typedef out of cpu-common.h, Igor Mammedov, 2012/10/15
- [Qemu-devel] [PATCH 10/12] qdev: use full qdev.h include path on qdev*.c, Igor Mammedov, 2012/10/15
- [Qemu-devel] [PATCH 08/12] qdev: move reset register/unregister code to qdev-system.c, Igor Mammedov, 2012/10/15
- [Qemu-devel] [PATCH 12/12] qom: make CPU a child of DeviceState, Igor Mammedov, 2012/10/15
- [Qemu-devel] [PATCH 11/12] include core qdev code into *-user, too, Igor Mammedov, 2012/10/15