From patchwork Tue Oct 16 19:08:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 191871 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 D388F2C00A6 for ; Wed, 17 Oct 2012 06:49:03 +1100 (EST) Received: from localhost ([::1]:33408 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOCVo-0005Cx-Jp for incoming@patchwork.ozlabs.org; Tue, 16 Oct 2012 15:09:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOCUt-000317-FQ for qemu-devel@nongnu.org; Tue, 16 Oct 2012 15:08:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOCUm-0001Nc-2w for qemu-devel@nongnu.org; Tue, 16 Oct 2012 15:08:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27700) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOCUl-0001Mt-Ot for qemu-devel@nongnu.org; Tue, 16 Oct 2012 15:08:03 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9GJ7r9Q012114 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 16 Oct 2012 15:07:53 -0400 Received: from blackpad.lan.raisama.net (vpn1-4-87.gru2.redhat.com [10.97.4.87]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q9GJ7qTE018430; Tue, 16 Oct 2012 15:07:52 -0400 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 27B54201161; Tue, 16 Oct 2012 16:08:45 -0300 (BRT) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 16 Oct 2012 16:08:39 -0300 Message-Id: <1350414523-8117-9-git-send-email-ehabkost@redhat.com> In-Reply-To: <1350414523-8117-1-git-send-email-ehabkost@redhat.com> References: <1350414523-8117-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, riku.voipio@iki.fi, blauwirbel@gmail.com, Anthony Liguori , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 08/12] qdev: move reset register/unregister code to qdev-system.c 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 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 --- 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); +}