From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOCUt-00030W-8j 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-0001O6-Co for qemu-devel@nongnu.org; Tue, 16 Oct 2012 15:08:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26645) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOCUm-0001N6-3W for qemu-devel@nongnu.org; Tue, 16 Oct 2012 15:08:04 -0400 From: Eduardo Habkost Date: Tue, 16 Oct 2012 16:08:36 -0300 Message-Id: <1350414523-8117-6-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> Subject: [Qemu-devel] [PATCH 05/12] qdev-core: isolate vmstate handling into separate functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, riku.voipio@iki.fi, blauwirbel@gmail.com, Anthony Liguori , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Those functions will eventually be moved somewhere else, and won't get included on *-user. Signed-off-by: Eduardo Habkost --- hw/qdev-core.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/hw/qdev-core.c b/hw/qdev-core.c index ee19dd5..92c3021 100644 --- a/hw/qdev-core.c +++ b/hw/qdev-core.c @@ -40,6 +40,22 @@ const VMStateDescription *qdev_get_vmsd(DeviceState *dev) return dc->vmsd; } +static 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); + } +} + +static void 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) { DeviceClass *dc = DEVICE_GET_CLASS(dev); @@ -126,11 +142,7 @@ int qdev_init(DeviceState *dev) g_free(name); } - 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); - } + qdev_init_vmstate(dev); dev->state = DEV_STATE_INITIALIZED; if (dev->hotplugged) { device_reset(dev); @@ -615,9 +627,7 @@ static void device_finalize(Object *obj) bus = QLIST_FIRST(&dev->child_bus); qbus_free(bus); } - if (qdev_get_vmsd(dev)) { - vmstate_unregister(dev, qdev_get_vmsd(dev), dev); - } + qdev_finalize_vmstate(dev); if (dc->exit) { dc->exit(dev); } -- 1.7.11.7