From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNwPu-0005EX-HK for qemu-devel@nongnu.org; Mon, 15 Oct 2012 21:57:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TNwPt-0006DY-9r for qemu-devel@nongnu.org; Mon, 15 Oct 2012 21:57:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24260) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNwPt-0006CE-0E for qemu-devel@nongnu.org; Mon, 15 Oct 2012 21:57:57 -0400 From: Igor Mammedov Date: Tue, 16 Oct 2012 03:57:20 +0200 Message-Id: <1350352644-14436-9-git-send-email-imammedo@redhat.com> In-Reply-To: <1350352644-14436-1-git-send-email-imammedo@redhat.com> References: <1350352644-14436-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 08/12] qdev: move reset register/unregister code to qdev-system.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, aliguori@us.ibm.com, afaerber@suse.de, ehabkost@redhat.com From: Eduardo Habkost 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 --- 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 924c6ea..8218cec 100644 --- a/hw/qdev-core.h +++ b/hw/qdev-core.h @@ -226,6 +226,9 @@ const struct VMStateDescription *qdev_get_vmsd(DeviceState *dev); void qdev_init_vmstate(DeviceState *dev); void qdev_finalize_vmstate(DeviceState *dev); +void qbus_register_reset(BusState *bus); +void 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 27d1fc9..b890f5f 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