From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOY1B-0005JF-Vs for qemu-devel@nongnu.org; Wed, 17 Oct 2012 14:07:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOY1A-0001YR-8q for qemu-devel@nongnu.org; Wed, 17 Oct 2012 14:06:57 -0400 Received: from mail-oa0-f45.google.com ([209.85.219.45]:64481) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOY1A-0001YL-3r for qemu-devel@nongnu.org; Wed, 17 Oct 2012 14:06:56 -0400 Received: by mail-oa0-f45.google.com with SMTP id i18so7443866oag.4 for ; Wed, 17 Oct 2012 11:06:55 -0700 (PDT) From: Anthony Liguori In-Reply-To: <1350414523-8117-6-git-send-email-ehabkost@redhat.com> References: <1350414523-8117-1-git-send-email-ehabkost@redhat.com> <1350414523-8117-6-git-send-email-ehabkost@redhat.com> Date: Wed, 17 Oct 2012 13:06:51 -0500 Message-ID: <877gqpug5g.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [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: Eduardo Habkost , qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, Igor Mammedov , riku.voipio@iki.fi, Andreas =?utf-8?Q?F=C3=A4rber?= , peter.maydell@linaro.org Eduardo Habkost writes: > 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); > + } > +} > + You're stubbing at the wrong level. The place to implement stubs ought to be vmstate_register/vmstate_unregister. Regards, Anthony Liguori > 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