[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/12] qdev: move reset register/unregister code to
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 08/12] qdev: move reset register/unregister code to qdev-system.c |
Date: |
Tue, 16 Oct 2012 16:08:39 -0300 |
Also, add weak symbols that will be used if qdev-system.o is not
compiled in (i.e. on *-user).
Signed-off-by: Eduardo Habkost <address@hidden>
---
Changes v1 -> v2:
- Add GCC_WEAK_DECL to function declarations
---
hw/qdev-core.c | 16 +++++++---------
hw/qdev-core.h | 3 +++
hw/qdev-system.c | 15 +++++++++++++++
3 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/hw/qdev-core.c b/hw/qdev-core.c
index a105679..a756e07 100644
--- a/hw/qdev-core.c
+++ b/hw/qdev-core.c
@@ -47,19 +47,17 @@ void GCC_WEAK qdev_finalize_vmstate(DeviceState *dev)
{
}
-static void qbus_register_reset(BusState *bus)
+/* reset handler register/unregister:
+ *
+ * The real implementations are on qdev-system.c. Those are weak symbols
+ * used by *-user.
+ */
+void GCC_WEAK 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)
+void GCC_WEAK 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)
diff --git a/hw/qdev-core.h b/hw/qdev-core.h
index 89c54d5..e030fff 100644
--- a/hw/qdev-core.h
+++ b/hw/qdev-core.h
@@ -226,6 +226,9 @@ const struct VMStateDescription *qdev_get_vmsd(DeviceState
*dev);
void GCC_WEAK_DECL qdev_init_vmstate(DeviceState *dev);
void GCC_WEAK_DECL qdev_finalize_vmstate(DeviceState *dev);
+void GCC_WEAK_DECL qbus_register_reset(BusState *bus);
+void GCC_WEAK_DECL qbus_unregister_reset(BusState *bus);
+
const char *qdev_fw_name(DeviceState *dev);
Object *qdev_get_machine(void);
diff --git a/hw/qdev-system.c b/hw/qdev-system.c
index 0c00ab3..21074a0 100644
--- a/hw/qdev-system.c
+++ b/hw/qdev-system.c
@@ -88,3 +88,18 @@ void qdev_finalize_vmstate(DeviceState *dev)
vmstate_unregister(dev, qdev_get_vmsd(dev), dev);
}
}
+
+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);
+ }
+}
+
+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);
+}
--
1.7.11.7
[Qemu-devel] [PATCH 08/12] qdev: move reset register/unregister code to qdev-system.c,
Eduardo Habkost <=
[Qemu-devel] [PATCH 05/12] qdev-core: isolate vmstate handling into separate functions, Eduardo Habkost, 2012/10/16
[Qemu-devel] [PATCH 09/12] move qemu_irq typedef out of cpu-common.h, Eduardo Habkost, 2012/10/16
[Qemu-devel] [PATCH 12/12] qom: make CPU a child of DeviceState, Eduardo Habkost, 2012/10/16
[Qemu-devel] [PATCH 04/12] qdev: rename qdev.c to qdev-core.c, Eduardo Habkost, 2012/10/16
[Qemu-devel] [PATCH 03/12] qdev: separate core from the code used only by qemu-system-*, Eduardo Habkost, 2012/10/16
[Qemu-devel] [PATCH 01/12] qdev: split up header so it can be used in cpu.h, Eduardo Habkost, 2012/10/16
[Qemu-devel] [PATCH 11/12] include core qdev code into *-user, too, Eduardo Habkost, 2012/10/16