From patchwork Thu Oct 4 19:15:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 189307 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0E0472C03F0 for ; Fri, 5 Oct 2012 06:31:48 +1000 (EST) Received: from localhost ([::1]:49883 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJqtd-0003Qn-3P for incoming@patchwork.ozlabs.org; Thu, 04 Oct 2012 15:15:45 -0400 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 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q94JEgoB012490 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 4 Oct 2012 15:14:42 -0400 Received: from blackpad.lan.raisama.net (vpn1-7-183.gru2.redhat.com [10.97.7.183]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q94JEfup021316; Thu, 4 Oct 2012 15:14:42 -0400 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 890CE20362A; Thu, 4 Oct 2012 16:15:42 -0300 (BRT) From: Eduardo Habkost To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori , Paolo Bonzini Subject: [Qemu-devel] [RFC 08/13] qdev-core: isolate reset register/unregister code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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); }