From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55481) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJqsl-0001yr-0N for qemu-devel@nongnu.org; Thu, 04 Oct 2012 15:14:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJqse-0003kE-Gg for qemu-devel@nongnu.org; Thu, 04 Oct 2012 15:14:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19736) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJqse-0003ij-6E for qemu-devel@nongnu.org; Thu, 04 Oct 2012 15:14:44 -0400 From: Eduardo Habkost Date: Thu, 4 Oct 2012 16:15:28 -0300 Message-Id: <1349378133-25644-9-git-send-email-ehabkost@redhat.com> In-Reply-To: <1349378133-25644-1-git-send-email-ehabkost@redhat.com> References: <1349378133-25644-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 08/13] 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: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori , Paolo Bonzini 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 a5cac45..1b45e51 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); @@ -348,10 +363,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); } } @@ -685,8 +698,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.4