From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50745) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNwPm-0004ri-Vm for qemu-devel@nongnu.org; Mon, 15 Oct 2012 21:57:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TNwPl-00065L-Uz for qemu-devel@nongnu.org; Mon, 15 Oct 2012 21:57:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55211) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNwPl-00065C-Jy for qemu-devel@nongnu.org; Mon, 15 Oct 2012 21:57:49 -0400 From: Igor Mammedov Date: Tue, 16 Oct 2012 03:57:19 +0200 Message-Id: <1350352644-14436-8-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 07/12] qdev-core: isolate reset register/unregister code 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 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 --- 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