From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJqsg-0001uO-Q4 for qemu-devel@nongnu.org; Thu, 04 Oct 2012 15:14:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJqse-0003jx-Fc for qemu-devel@nongnu.org; Thu, 04 Oct 2012 15:14:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11198) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJqse-0003il-6F for qemu-devel@nongnu.org; Thu, 04 Oct 2012 15:14:44 -0400 From: Eduardo Habkost Date: Thu, 4 Oct 2012 16:15:27 -0300 Message-Id: <1349378133-25644-8-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 07/13] qdev: move vmstate handling to qdev-system.c 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 Add GCC_WEAK symbols to qdev-core.c, so that qdev-core.o can be used without qdev-system.o (i.e. by *-user). Signed-off-by: Eduardo Habkost --- hw/qdev-core.c | 23 +++++++---------------- hw/qdev-core.h | 2 ++ hw/qdev-system.c | 22 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/hw/qdev-core.c b/hw/qdev-core.c index 242347f..a5cac45 100644 --- a/hw/qdev-core.c +++ b/hw/qdev-core.c @@ -34,26 +34,17 @@ int qdev_hotplug = 0; static bool qdev_hot_added = false; static bool qdev_hot_removed = false; -const VMStateDescription *qdev_get_vmsd(DeviceState *dev) -{ - DeviceClass *dc = DEVICE_GET_CLASS(dev); - return dc->vmsd; -} - -static void qdev_init_vmstate(DeviceState *dev) +/* vmstate handling: + * + * The real implementations are on qdev-system.c. Those are weak symbols + * used by *-user. + */ +void GCC_WEAK qdev_init_vmstate(DeviceState *dev) { - if (qdev_get_vmsd(dev)) { - vmstate_register_with_alias_id(dev, -1, qdev_get_vmsd(dev), dev, - dev->instance_id_alias, - dev->alias_required_for_version); - } } -static void qdev_finalize_vmstate(DeviceState *dev) +void GCC_WEAK qdev_finalize_vmstate(DeviceState *dev) { - if (qdev_get_vmsd(dev)) { - vmstate_unregister(dev, qdev_get_vmsd(dev), dev); - } } const char *qdev_fw_name(DeviceState *dev) diff --git a/hw/qdev-core.h b/hw/qdev-core.h index ca205fc..e9b6d6d 100644 --- a/hw/qdev-core.h +++ b/hw/qdev-core.h @@ -225,6 +225,8 @@ void qdev_machine_init(void); void device_reset(DeviceState *dev); const struct VMStateDescription *qdev_get_vmsd(DeviceState *dev); +void qdev_init_vmstate(DeviceState *dev); +void qdev_finalize_vmstate(DeviceState *dev); const char *qdev_fw_name(DeviceState *dev); diff --git a/hw/qdev-system.c b/hw/qdev-system.c index 4891d2f..b4d40e8 100644 --- a/hw/qdev-system.c +++ b/hw/qdev-system.c @@ -91,3 +91,25 @@ DeviceState *qdev_try_create(BusState *bus, const char *type) return dev; } + +const VMStateDescription *qdev_get_vmsd(DeviceState *dev) +{ + DeviceClass *dc = DEVICE_GET_CLASS(dev); + return dc->vmsd; +} + +void qdev_init_vmstate(DeviceState *dev) +{ + if (qdev_get_vmsd(dev)) { + vmstate_register_with_alias_id(dev, -1, qdev_get_vmsd(dev), dev, + dev->instance_id_alias, + dev->alias_required_for_version); + } +} + +void qdev_finalize_vmstate(DeviceState *dev) +{ + if (qdev_get_vmsd(dev)) { + vmstate_unregister(dev, qdev_get_vmsd(dev), dev); + } +} -- 1.7.11.4