From patchwork Thu Oct 4 19:15:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 189284 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 00A732C03DB for ; Fri, 5 Oct 2012 05:57:07 +1000 (EST) Received: from localhost ([::1]:49458 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJqtI-00039J-SU for incoming@patchwork.ozlabs.org; Thu, 04 Oct 2012 15:15:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55469) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJqsk-0001vw-1F for qemu-devel@nongnu.org; Thu, 04 Oct 2012 15:14:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJqse-0003k0-Fl for qemu-devel@nongnu.org; Thu, 04 Oct 2012 15:14:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15416) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJqse-0003id-5w for qemu-devel@nongnu.org; Thu, 04 Oct 2012 15:14:44 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q94JEgH9004845 (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-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q94JEfr7021673; Thu, 4 Oct 2012 15:14:42 -0400 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id A7AF820362B; Thu, 4 Oct 2012 16:15:42 -0300 (BRT) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Thu, 4 Oct 2012 16:15:29 -0300 Message-Id: <1349378133-25644-10-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.23 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 09/13] 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 --- 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 1b45e51..46ab239 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 e9b6d6d..e10021d 100644 --- a/hw/qdev-core.h +++ b/hw/qdev-core.h @@ -228,6 +228,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 b4d40e8..eca5fd5 100644 --- a/hw/qdev-system.c +++ b/hw/qdev-system.c @@ -113,3 +113,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); +}