From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwGW8-0004bD-5w for qemu-devel@nongnu.org; Mon, 08 Jul 2013 14:50:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UwGW5-0006mG-Oo for qemu-devel@nongnu.org; Mon, 08 Jul 2013 14:50:32 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:57685) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwGW5-0006mC-Gn for qemu-devel@nongnu.org; Mon, 08 Jul 2013 14:50:29 -0400 Received: from /spool/local by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 8 Jul 2013 12:40:17 -0600 From: Anthony Liguori In-Reply-To: <1372315560-5478-8-git-send-email-aik@ozlabs.ru> References: <1372315560-5478-1-git-send-email-aik@ozlabs.ru> <1372315560-5478-8-git-send-email-aik@ozlabs.ru> Date: Mon, 08 Jul 2013 13:36:21 -0500 Message-ID: <87vc4kzyoq.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH 07/17] pseries: savevm support for PAPR VIO logical lan List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy , qemu-devel@nongnu.org Cc: Alexander Graf , qemu-ppc@nongnu.org, Paolo Bonzini , Paul Mackerras , David Gibson Alexey Kardashevskiy writes: > From: David Gibson > > This patch adds the necessary VMStateDescription information to support > savevm/loadvm for the spapr_llan (PAPR logical lan) device. > > Signed-off-by: David Gibson > Signed-off-by: Alexey Kardashevskiy > --- > hw/char/spapr_vty.c | 16 ++++++++++++++++ Please split this out. But then you can add: Reviewed-by: Anthony Liguori Regards, Anthony Liguori > hw/net/spapr_llan.c | 24 ++++++++++++++++++++++-- > 2 files changed, 38 insertions(+), 2 deletions(-) > > diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c > index 2993848..a799721 100644 > --- a/hw/char/spapr_vty.c > +++ b/hw/char/spapr_vty.c > @@ -142,6 +142,21 @@ static Property spapr_vty_properties[] = { > DEFINE_PROP_END_OF_LIST(), > }; > > +static const VMStateDescription vmstate_spapr_vty = { > + .name = "spapr_vty", > + .version_id = 1, > + .minimum_version_id = 1, > + .minimum_version_id_old = 1, > + .fields = (VMStateField []) { > + VMSTATE_SPAPR_VIO(sdev, VIOsPAPRVTYDevice), > + > + VMSTATE_UINT32(in, VIOsPAPRVTYDevice), > + VMSTATE_UINT32(out, VIOsPAPRVTYDevice), > + VMSTATE_BUFFER(buf, VIOsPAPRVTYDevice), > + VMSTATE_END_OF_LIST() > + }, > +}; > + > static void spapr_vty_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > @@ -152,6 +167,7 @@ static void spapr_vty_class_init(ObjectClass *klass, void *data) > k->dt_type = "serial"; > k->dt_compatible = "hvterm1"; > dc->props = spapr_vty_properties; > + dc->vmsd = &vmstate_spapr_vty; > } > > static const TypeInfo spapr_vty_info = { > diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c > index 03a09f2..46f7d5f 100644 > --- a/hw/net/spapr_llan.c > +++ b/hw/net/spapr_llan.c > @@ -81,9 +81,9 @@ typedef struct VIOsPAPRVLANDevice { > VIOsPAPRDevice sdev; > NICConf nicconf; > NICState *nic; > - int isopen; > + bool isopen; > target_ulong buf_list; > - int add_buf_ptr, use_buf_ptr, rx_bufs; > + uint32_t add_buf_ptr, use_buf_ptr, rx_bufs; > target_ulong rxq_ptr; > } VIOsPAPRVLANDevice; > > @@ -500,6 +500,25 @@ static Property spapr_vlan_properties[] = { > DEFINE_PROP_END_OF_LIST(), > }; > > +static const VMStateDescription vmstate_spapr_llan = { > + .name = "spapr_llan", > + .version_id = 1, > + .minimum_version_id = 1, > + .minimum_version_id_old = 1, > + .fields = (VMStateField []) { > + VMSTATE_SPAPR_VIO(sdev, VIOsPAPRVLANDevice), > + /* LLAN state */ > + VMSTATE_BOOL(isopen, VIOsPAPRVLANDevice), > + VMSTATE_UINTTL(buf_list, VIOsPAPRVLANDevice), > + VMSTATE_UINT32(add_buf_ptr, VIOsPAPRVLANDevice), > + VMSTATE_UINT32(use_buf_ptr, VIOsPAPRVLANDevice), > + VMSTATE_UINT32(rx_bufs, VIOsPAPRVLANDevice), > + VMSTATE_UINTTL(rxq_ptr, VIOsPAPRVLANDevice), > + > + VMSTATE_END_OF_LIST() > + }, > +}; > + > static void spapr_vlan_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > @@ -514,6 +533,7 @@ static void spapr_vlan_class_init(ObjectClass *klass, void *data) > k->signal_mask = 0x1; > dc->props = spapr_vlan_properties; > k->rtce_window_size = 0x10000000; > + dc->vmsd = &vmstate_spapr_llan; > } > > static const TypeInfo spapr_vlan_info = { > -- > 1.7.10.4