From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btTcE-00074k-Mf for qemu-devel@nongnu.org; Mon, 10 Oct 2016 01:59:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1btTc9-0004SD-UQ for qemu-devel@nongnu.org; Mon, 10 Oct 2016 01:59:09 -0400 Date: Mon, 10 Oct 2016 16:02:35 +1100 From: David Gibson Message-ID: <20161010050235.GD22498@umbus.fritz.box> References: <1475519097-27611-1-git-send-email-duanj@linux.vnet.ibm.com> <1475519097-27611-4-git-send-email-duanj@linux.vnet.ibm.com> <20161007120854.GE2040@work-vm> <097b567a-dfc9-58f2-0f8e-c63eb6fb13e4@linux.vnet.ibm.com> <20161007184211.GE25928@work-vm> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="kvUQC+jR9YzypDnK" Content-Disposition: inline In-Reply-To: <20161007184211.GE25928@work-vm> Subject: Re: [Qemu-devel] [Qemu-ppc] [QEMU PATCH v5 3/6] migration: extend VMStateInfo List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert" Cc: Jianjun Duan , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, dmitry@daynix.com, peter.maydell@linaro.org, kraxel@redhat.com, mst@redhat.com, pbonzini@redhat.com, veroniabahaa@gmail.com, quintela@redhat.com, amit.shah@redhat.com, mreitz@redhat.com, kwolf@redhat.com, rth@twiddle.net, aurelien@aurel32.net, leon.alrae@imgtec.com, blauwirbel@gmail.com, mark.cave-ayland@ilande.co.uk, mdroth@linux.vnet.ibm.com --kvUQC+jR9YzypDnK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Oct 07, 2016 at 07:42:12PM +0100, Dr. David Alan Gilbert wrote: > * Jianjun Duan (duanj@linux.vnet.ibm.com) wrote: > >=20 > >=20 > > On 10/07/2016 05:08 AM, Dr. David Alan Gilbert wrote: > > > * Jianjun Duan (duanj@linux.vnet.ibm.com) wrote: > > >> Current migration code cannot handle some data structures such as > > >> QTAILQ in qemu/queue.h. Here we extend the signatures of put/get > > >> in VMStateInfo so that customized handling is supported. > > >> > > >> Signed-off-by: Jianjun Duan > > >> --- > > >> hw/net/vmxnet3.c | 18 ++++++--- > > >> hw/nvram/eeprom93xx.c | 6 ++- > > >> hw/nvram/fw_cfg.c | 6 ++- > > >> hw/pci/msix.c | 6 ++- > > >> hw/pci/pci.c | 12 ++++-- > > >> hw/pci/shpc.c | 5 ++- > > >> hw/scsi/scsi-bus.c | 6 ++- > > >> hw/timer/twl92230.c | 6 ++- > > >> hw/usb/redirect.c | 18 ++++++--- > > >> hw/virtio/virtio-pci.c | 6 ++- > > >> hw/virtio/virtio.c | 6 ++- > > >> include/migration/vmstate.h | 10 +++-- > > >> migration/savevm.c | 5 ++- > > >> migration/vmstate.c | 95 ++++++++++++++++++++++++++++------= ----------- > > >> target-alpha/machine.c | 5 ++- > > >> target-arm/machine.c | 12 ++++-- > > >> target-i386/machine.c | 21 ++++++---- > > >> target-mips/machine.c | 10 +++-- > > >> target-ppc/machine.c | 10 +++-- > > >> target-sparc/machine.c | 5 ++- > > >> 20 files changed, 171 insertions(+), 97 deletions(-) > > >> > > >=20 > > > > > >=20 > > >> diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c > > >> index 444672a..2ca4b46 100644 > > >> --- a/hw/usb/redirect.c > > >> +++ b/hw/usb/redirect.c > > >> @@ -2154,7 +2154,8 @@ static int usbredir_post_load(void *priv, int = version_id) > > >> } > > >> =20 > > >> /* For usbredirparser migration */ > > >> -static void usbredir_put_parser(QEMUFile *f, void *priv, size_t unu= sed) > > >> +static void usbredir_put_parser(QEMUFile *f, void *priv, size_t unu= sed, > > >> + void *opaque, QJSON *vmdesc) > > >> { > > >> USBRedirDevice *dev =3D priv; > > >> uint8_t *data; > > >> @@ -2174,7 +2175,8 @@ static void usbredir_put_parser(QEMUFile *f, v= oid *priv, size_t unused) > > >> free(data); > > >> } > > >> =20 > > >> -static int usbredir_get_parser(QEMUFile *f, void *priv, size_t unus= ed) > > >> +static int usbredir_get_parser(QEMUFile *f, void *priv, size_t unus= ed, > > >> + void *opaque) > > >=20 > > > Neither of these built for me; I had to change those to VMStateField = rather than void *; > > >=20 > > > also is this series tested ontop of Halil's patches - because without= them > > > I'm finding I also had to fix up most of the other virtio devices. > > >=20 > > > Dave > >=20 > > I built it on top of ppc-for-2.8 without problems. Is Hail's patch in > > ppc-for-2.8 yet? If it's not in master, and not ppc specific, it won't be in ppc-for-2.8. > I don't know about ppc-for-2.8; patches for inclusion should work on the= current > head unless stated otherwise. Right. These started as ppc specific patches, for which being on top of ppc-for-2.8 would be the right choice (ppc-for-2.8 regularly rebases on master). However, they now include a bunch of generic migration changes, it should be done directly against master. This may require splitting the series into generic and ppc specific portions. > Also, make sure you have the usbredir libraries installed and as much els= e as possible > to make sure you cover all the .get/.put functions - they're all over! >=20 > Dave >=20 > > Thanks, > > Jianjun > >=20 > > >=20 > > >=20 > > >> USBRedirDevice *dev =3D priv; > > >> uint8_t *data; > > >> @@ -2217,7 +2219,8 @@ static const VMStateInfo usbredir_parser_vmsta= te_info =3D { > > >> =20 > > >> =20 > > >> /* For buffered packets (iso/irq) queue migration */ > > >> -static void usbredir_put_bufpq(QEMUFile *f, void *priv, size_t unus= ed) > > >> +static void usbredir_put_bufpq(QEMUFile *f, void *priv, size_t unus= ed, > > >> + VMStateField *field, QJSON *vmdesc) > > >> { > > >> struct endp_data *endp =3D priv; > > >> USBRedirDevice *dev =3D endp->dev; > > >> @@ -2237,7 +2240,8 @@ static void usbredir_put_bufpq(QEMUFile *f, vo= id *priv, size_t unused) > > >> assert(i =3D=3D endp->bufpq_size); > > >> } > > >> =20 > > >> -static int usbredir_get_bufpq(QEMUFile *f, void *priv, size_t unuse= d) > > >> +static int usbredir_get_bufpq(QEMUFile *f, void *priv, size_t unuse= d, > > >> + VMStateField *field) > > >> { > > >> struct endp_data *endp =3D priv; > > >> USBRedirDevice *dev =3D endp->dev; > > >> @@ -2340,7 +2344,8 @@ static const VMStateDescription usbredir_ep_vm= state =3D { > > >> =20 > > >> =20 > > >> /* For PacketIdQueue migration */ > > >> -static void usbredir_put_packet_id_q(QEMUFile *f, void *priv, size_= t unused) > > >> +static void usbredir_put_packet_id_q(QEMUFile *f, void *priv, size_= t unused, > > >> + VMStateField *field, QJSON *vm= desc) > > >> { > > >> struct PacketIdQueue *q =3D priv; > > >> USBRedirDevice *dev =3D q->dev; > > >> @@ -2356,7 +2361,8 @@ static void usbredir_put_packet_id_q(QEMUFile = *f, void *priv, size_t unused) > > >> assert(remain =3D=3D 0); > > >> } > > >> =20 > > >> -static int usbredir_get_packet_id_q(QEMUFile *f, void *priv, size_t= unused) > > >> +static int usbredir_get_packet_id_q(QEMUFile *f, void *priv, size_t= unused, > > >> + VMStateField *field) > > >> { > > >> struct PacketIdQueue *q =3D priv; > > >> USBRedirDevice *dev =3D q->dev; > > >> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c > > >> index 2d60a00..38a7abd 100644 > > >> --- a/hw/virtio/virtio-pci.c > > >> +++ b/hw/virtio/virtio-pci.c > > >> @@ -108,7 +108,8 @@ static bool virtio_pci_has_extra_state(DeviceSta= te *d) > > >> return proxy->flags & VIRTIO_PCI_FLAG_MIGRATE_EXTRA; > > >> } > > >> =20 > > >> -static int get_virtio_pci_modern_state(QEMUFile *f, void *pv, size_= t size) > > >> +static int get_virtio_pci_modern_state(QEMUFile *f, void *pv, size_= t size, > > >> + VMStateField *field) > > >> { > > >> VirtIOPCIProxy *proxy =3D pv; > > >> int i; > > >> @@ -137,7 +138,8 @@ static void virtio_pci_save_modern_queue_state(V= irtIOPCIQueue *vq, > > >> qemu_put_be32(f, vq->used[1]); > > >> } > > >> =20 > > >> -static void put_virtio_pci_modern_state(QEMUFile *f, void *pv, size= _t size) > > >> +static void put_virtio_pci_modern_state(QEMUFile *f, void *pv, size= _t size, > > >> + VMStateField *field, QJSON = *vmdesc) > > >> { > > >> VirtIOPCIProxy *proxy =3D pv; > > >> int i; > > >> diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c > > >> index 18ce333..ade2683 100644 > > >> --- a/hw/virtio/virtio.c > > >> +++ b/hw/virtio/virtio.c > > >> @@ -1467,7 +1467,8 @@ static const VMStateDescription vmstate_virtio= _ringsize =3D { > > >> } > > >> }; > > >> =20 > > >> -static int get_extra_state(QEMUFile *f, void *pv, size_t size) > > >> +static int get_extra_state(QEMUFile *f, void *pv, size_t size, > > >> + VMStateField *field) > > >> { > > >> VirtIODevice *vdev =3D pv; > > >> BusState *qbus =3D qdev_get_parent_bus(DEVICE(vdev)); > > >> @@ -1480,7 +1481,8 @@ static int get_extra_state(QEMUFile *f, void *= pv, size_t size) > > >> } > > >> } > > >> =20 > > >> -static void put_extra_state(QEMUFile *f, void *pv, size_t size) > > >> +static void put_extra_state(QEMUFile *f, void *pv, size_t size, > > >> + VMStateField *field, QJSON *vmdesc) > > >> { > > >> VirtIODevice *vdev =3D pv; > > >> BusState *qbus =3D qdev_get_parent_bus(DEVICE(vdev)); > > >> diff --git a/include/migration/vmstate.h b/include/migration/vmstate= =2Eh > > >> index 1638ee5..459dd4a 100644 > > >> --- a/include/migration/vmstate.h > > >> +++ b/include/migration/vmstate.h > > >> @@ -81,11 +81,13 @@ void unregister_savevm(DeviceState *dev, const c= har *idstr, void *opaque); > > >> =20 > > >> typedef struct VMStateInfo VMStateInfo; > > >> typedef struct VMStateDescription VMStateDescription; > > >> +typedef struct VMStateField VMStateField; > > >> =20 > > >> struct VMStateInfo { > > >> const char *name; > > >> - int (*get)(QEMUFile *f, void *pv, size_t size); > > >> - void (*put)(QEMUFile *f, void *pv, size_t size); > > >> + int (*get)(QEMUFile *f, void *pv, size_t size, VMStateField *fi= eld); > > >> + void (*put)(QEMUFile *f, void *pv, size_t size, VMStateField *f= ield, > > >> + QJSON *vmdesc); > > >> }; > > >> =20 > > >> enum VMStateFlags { > > >> @@ -186,7 +188,7 @@ enum VMStateFlags { > > >> VMS_MULTIPLY_ELEMENTS =3D 0x4000, > > >> }; > > >> =20 > > >> -typedef struct { > > >> +struct VMStateField { > > >> const char *name; > > >> size_t offset; > > >> size_t size; > > >> @@ -199,7 +201,7 @@ typedef struct { > > >> const VMStateDescription *vmsd; > > >> int version_id; > > >> bool (*field_exists)(void *opaque, int version_id); > > >> -} VMStateField; > > >> +}; > > >> =20 > > >> struct VMStateDescription { > > >> const char *name; > > >> diff --git a/migration/savevm.c b/migration/savevm.c > > >> index ef5c3d1..13b53ad 100644 > > >> --- a/migration/savevm.c > > >> +++ b/migration/savevm.c > > >> @@ -220,14 +220,15 @@ void timer_get(QEMUFile *f, QEMUTimer *ts) > > >> * Not in vmstate.c to not add qemu-timer.c as dependency to vmstat= e.c > > >> */ > > >> =20 > > >> -static int get_timer(QEMUFile *f, void *pv, size_t size) > > >> +static int get_timer(QEMUFile *f, void *pv, size_t size, VMStateFie= ld *field) > > >> { > > >> QEMUTimer *v =3D pv; > > >> timer_get(f, v); > > >> return 0; > > >> } > > >> =20 > > >> -static void put_timer(QEMUFile *f, void *pv, size_t size) > > >> +static void put_timer(QEMUFile *f, void *pv, size_t size, VMStateFi= eld *field, > > >> + QJSON *vmdesc) > > >> { > > >> QEMUTimer *v =3D pv; > > >> timer_put(f, v); > > >> diff --git a/migration/vmstate.c b/migration/vmstate.c > > >> index fc29acf..66802cb 100644 > > >> --- a/migration/vmstate.c > > >> +++ b/migration/vmstate.c > > >> @@ -122,7 +122,7 @@ int vmstate_load_state(QEMUFile *f, const VMStat= eDescription *vmsd, > > >> ret =3D vmstate_load_state(f, field->vmsd, addr, > > >> field->vmsd->version_i= d); > > >> } else { > > >> - ret =3D field->info->get(f, addr, size); > > >> + ret =3D field->info->get(f, addr, size, NULL); > > >> =20 > > >> } > > >> if (ret >=3D 0) { > > >> @@ -328,7 +328,7 @@ void vmstate_save_state(QEMUFile *f, const VMSta= teDescription *vmsd, > > >> if (field->flags & VMS_STRUCT) { > > >> vmstate_save_state(f, field->vmsd, addr, vmdesc= _loop); > > >> } else { > > >> - field->info->put(f, addr, size); > > >> + field->info->put(f, addr, size, NULL, NULL); > > >> } > > >> =20 > > >> written_bytes =3D qemu_ftell_fast(f) - old_offset; > > >> @@ -461,14 +461,15 @@ static void vmstate_subsection_save(QEMUFile *= f, const VMStateDescription *vmsd, > > >> =20 > > >> /* bool */ > > >> =20 > > >> -static int get_bool(QEMUFile *f, void *pv, size_t size) > > >> +static int get_bool(QEMUFile *f, void *pv, size_t size, VMStateFiel= d *field) > > >> { > > >> bool *v =3D pv; > > >> *v =3D qemu_get_byte(f); > > >> return 0; > > >> } > > >> =20 > > >> -static void put_bool(QEMUFile *f, void *pv, size_t size) > > >> +static void put_bool(QEMUFile *f, void *pv, size_t size, VMStateFie= ld *field, > > >> + QJSON *vmdesc) > > >> { > > >> bool *v =3D pv; > > >> qemu_put_byte(f, *v); > > >> @@ -482,14 +483,15 @@ const VMStateInfo vmstate_info_bool =3D { > > >> =20 > > >> /* 8 bit int */ > > >> =20 > > >> -static int get_int8(QEMUFile *f, void *pv, size_t size) > > >> +static int get_int8(QEMUFile *f, void *pv, size_t size, VMStateFiel= d *field) > > >> { > > >> int8_t *v =3D pv; > > >> qemu_get_s8s(f, v); > > >> return 0; > > >> } > > >> =20 > > >> -static void put_int8(QEMUFile *f, void *pv, size_t size) > > >> +static void put_int8(QEMUFile *f, void *pv, size_t size, VMStateFie= ld *field, > > >> + QJSON *vmdesc) > > >> { > > >> int8_t *v =3D pv; > > >> qemu_put_s8s(f, v); > > >> @@ -503,14 +505,15 @@ const VMStateInfo vmstate_info_int8 =3D { > > >> =20 > > >> /* 16 bit int */ > > >> =20 > > >> -static int get_int16(QEMUFile *f, void *pv, size_t size) > > >> +static int get_int16(QEMUFile *f, void *pv, size_t size, VMStateFie= ld *field) > > >> { > > >> int16_t *v =3D pv; > > >> qemu_get_sbe16s(f, v); > > >> return 0; > > >> } > > >> =20 > > >> -static void put_int16(QEMUFile *f, void *pv, size_t size) > > >> +static void put_int16(QEMUFile *f, void *pv, size_t size, VMStateFi= eld *field, > > >> + QJSON *vmdesc) > > >> { > > >> int16_t *v =3D pv; > > >> qemu_put_sbe16s(f, v); > > >> @@ -524,14 +527,15 @@ const VMStateInfo vmstate_info_int16 =3D { > > >> =20 > > >> /* 32 bit int */ > > >> =20 > > >> -static int get_int32(QEMUFile *f, void *pv, size_t size) > > >> +static int get_int32(QEMUFile *f, void *pv, size_t size, VMStateFie= ld *field) > > >> { > > >> int32_t *v =3D pv; > > >> qemu_get_sbe32s(f, v); > > >> return 0; > > >> } > > >> =20 > > >> -static void put_int32(QEMUFile *f, void *pv, size_t size) > > >> +static void put_int32(QEMUFile *f, void *pv, size_t size, VMStateFi= eld *field, > > >> + QJSON *vmdesc) > > >> { > > >> int32_t *v =3D pv; > > >> qemu_put_sbe32s(f, v); > > >> @@ -546,7 +550,8 @@ const VMStateInfo vmstate_info_int32 =3D { > > >> /* 32 bit int. See that the received value is the same than the one > > >> in the field */ > > >> =20 > > >> -static int get_int32_equal(QEMUFile *f, void *pv, size_t size) > > >> +static int get_int32_equal(QEMUFile *f, void *pv, size_t size, > > >> + VMStateField *field) > > >> { > > >> int32_t *v =3D pv; > > >> int32_t v2; > > >> @@ -568,7 +573,7 @@ const VMStateInfo vmstate_info_int32_equal =3D { > > >> * and less than or equal to the one in the field. > > >> */ > > >> =20 > > >> -static int get_int32_le(QEMUFile *f, void *pv, size_t size) > > >> +static int get_int32_le(QEMUFile *f, void *pv, size_t size, VMState= Field *field) > > >> { > > >> int32_t *cur =3D pv; > > >> int32_t loaded; > > >> @@ -589,14 +594,15 @@ const VMStateInfo vmstate_info_int32_le =3D { > > >> =20 > > >> /* 64 bit int */ > > >> =20 > > >> -static int get_int64(QEMUFile *f, void *pv, size_t size) > > >> +static int get_int64(QEMUFile *f, void *pv, size_t size, VMStateFie= ld *field) > > >> { > > >> int64_t *v =3D pv; > > >> qemu_get_sbe64s(f, v); > > >> return 0; > > >> } > > >> =20 > > >> -static void put_int64(QEMUFile *f, void *pv, size_t size) > > >> +static void put_int64(QEMUFile *f, void *pv, size_t size, VMStateFi= eld *field, > > >> + QJSON *vmdesc) > > >> { > > >> int64_t *v =3D pv; > > >> qemu_put_sbe64s(f, v); > > >> @@ -610,14 +616,15 @@ const VMStateInfo vmstate_info_int64 =3D { > > >> =20 > > >> /* 8 bit unsigned int */ > > >> =20 > > >> -static int get_uint8(QEMUFile *f, void *pv, size_t size) > > >> +static int get_uint8(QEMUFile *f, void *pv, size_t size, VMStateFie= ld *field) > > >> { > > >> uint8_t *v =3D pv; > > >> qemu_get_8s(f, v); > > >> return 0; > > >> } > > >> =20 > > >> -static void put_uint8(QEMUFile *f, void *pv, size_t size) > > >> +static void put_uint8(QEMUFile *f, void *pv, size_t size, VMStateFi= eld *field, > > >> + QJSON *vmdesc) > > >> { > > >> uint8_t *v =3D pv; > > >> qemu_put_8s(f, v); > > >> @@ -631,14 +638,15 @@ const VMStateInfo vmstate_info_uint8 =3D { > > >> =20 > > >> /* 16 bit unsigned int */ > > >> =20 > > >> -static int get_uint16(QEMUFile *f, void *pv, size_t size) > > >> +static int get_uint16(QEMUFile *f, void *pv, size_t size, VMStateFi= eld *field) > > >> { > > >> uint16_t *v =3D pv; > > >> qemu_get_be16s(f, v); > > >> return 0; > > >> } > > >> =20 > > >> -static void put_uint16(QEMUFile *f, void *pv, size_t size) > > >> +static void put_uint16(QEMUFile *f, void *pv, size_t size, VMStateF= ield *field, > > >> + QJSON *vmdesc) > > >> { > > >> uint16_t *v =3D pv; > > >> qemu_put_be16s(f, v); > > >> @@ -652,14 +660,15 @@ const VMStateInfo vmstate_info_uint16 =3D { > > >> =20 > > >> /* 32 bit unsigned int */ > > >> =20 > > >> -static int get_uint32(QEMUFile *f, void *pv, size_t size) > > >> +static int get_uint32(QEMUFile *f, void *pv, size_t size, VMStateFi= eld *field) > > >> { > > >> uint32_t *v =3D pv; > > >> qemu_get_be32s(f, v); > > >> return 0; > > >> } > > >> =20 > > >> -static void put_uint32(QEMUFile *f, void *pv, size_t size) > > >> +static void put_uint32(QEMUFile *f, void *pv, size_t size, VMStateF= ield *field, > > >> + QJSON *vmdesc) > > >> { > > >> uint32_t *v =3D pv; > > >> qemu_put_be32s(f, v); > > >> @@ -674,7 +683,8 @@ const VMStateInfo vmstate_info_uint32 =3D { > > >> /* 32 bit uint. See that the received value is the same than the one > > >> in the field */ > > >> =20 > > >> -static int get_uint32_equal(QEMUFile *f, void *pv, size_t size) > > >> +static int get_uint32_equal(QEMUFile *f, void *pv, size_t size, > > >> + VMStateField *field) > > >> { > > >> uint32_t *v =3D pv; > > >> uint32_t v2; > > >> @@ -694,14 +704,15 @@ const VMStateInfo vmstate_info_uint32_equal = =3D { > > >> =20 > > >> /* 64 bit unsigned int */ > > >> =20 > > >> -static int get_uint64(QEMUFile *f, void *pv, size_t size) > > >> +static int get_uint64(QEMUFile *f, void *pv, size_t size, VMStateFi= eld *field) > > >> { > > >> uint64_t *v =3D pv; > > >> qemu_get_be64s(f, v); > > >> return 0; > > >> } > > >> =20 > > >> -static void put_uint64(QEMUFile *f, void *pv, size_t size) > > >> +static void put_uint64(QEMUFile *f, void *pv, size_t size, VMStateF= ield *field, > > >> + QJSON *vmdesc) > > >> { > > >> uint64_t *v =3D pv; > > >> qemu_put_be64s(f, v); > > >> @@ -716,7 +727,8 @@ const VMStateInfo vmstate_info_uint64 =3D { > > >> /* 64 bit unsigned int. See that the received value is the same tha= n the one > > >> in the field */ > > >> =20 > > >> -static int get_uint64_equal(QEMUFile *f, void *pv, size_t size) > > >> +static int get_uint64_equal(QEMUFile *f, void *pv, size_t size, > > >> + VMStateField *field) > > >> { > > >> uint64_t *v =3D pv; > > >> uint64_t v2; > > >> @@ -737,7 +749,8 @@ const VMStateInfo vmstate_info_uint64_equal =3D { > > >> /* 8 bit int. See that the received value is the same than the one > > >> in the field */ > > >> =20 > > >> -static int get_uint8_equal(QEMUFile *f, void *pv, size_t size) > > >> +static int get_uint8_equal(QEMUFile *f, void *pv, size_t size, > > >> + VMStateField *field) > > >> { > > >> uint8_t *v =3D pv; > > >> uint8_t v2; > > >> @@ -758,7 +771,8 @@ const VMStateInfo vmstate_info_uint8_equal =3D { > > >> /* 16 bit unsigned int int. See that the received value is the same= than the one > > >> in the field */ > > >> =20 > > >> -static int get_uint16_equal(QEMUFile *f, void *pv, size_t size) > > >> +static int get_uint16_equal(QEMUFile *f, void *pv, size_t size, > > >> + VMStateField *field) > > >> { > > >> uint16_t *v =3D pv; > > >> uint16_t v2; > > >> @@ -778,7 +792,8 @@ const VMStateInfo vmstate_info_uint16_equal =3D { > > >> =20 > > >> /* floating point */ > > >> =20 > > >> -static int get_float64(QEMUFile *f, void *pv, size_t size) > > >> +static int get_float64(QEMUFile *f, void *pv, size_t size, > > >> + VMStateField *field) > > >> { > > >> float64 *v =3D pv; > > >> =20 > > >> @@ -786,7 +801,8 @@ static int get_float64(QEMUFile *f, void *pv, si= ze_t size) > > >> return 0; > > >> } > > >> =20 > > >> -static void put_float64(QEMUFile *f, void *pv, size_t size) > > >> +static void put_float64(QEMUFile *f, void *pv, size_t size, VMState= Field *field, > > >> + QJSON *vmdesc) > > >> { > > >> uint64_t *v =3D pv; > > >> =20 > > >> @@ -801,7 +817,8 @@ const VMStateInfo vmstate_info_float64 =3D { > > >> =20 > > >> /* CPU_DoubleU type */ > > >> =20 > > >> -static int get_cpudouble(QEMUFile *f, void *pv, size_t size) > > >> +static int get_cpudouble(QEMUFile *f, void *pv, size_t size, > > >> + VMStateField *field) > > >> { > > >> CPU_DoubleU *v =3D pv; > > >> qemu_get_be32s(f, &v->l.upper); > > >> @@ -809,7 +826,8 @@ static int get_cpudouble(QEMUFile *f, void *pv, = size_t size) > > >> return 0; > > >> } > > >> =20 > > >> -static void put_cpudouble(QEMUFile *f, void *pv, size_t size) > > >> +static void put_cpudouble(QEMUFile *f, void *pv, size_t size, > > >> + VMStateField *field, QJSON *vmdesc) > > >> { > > >> CPU_DoubleU *v =3D pv; > > >> qemu_put_be32s(f, &v->l.upper); > > >> @@ -824,14 +842,16 @@ const VMStateInfo vmstate_info_cpudouble =3D { > > >> =20 > > >> /* uint8_t buffers */ > > >> =20 > > >> -static int get_buffer(QEMUFile *f, void *pv, size_t size) > > >> +static int get_buffer(QEMUFile *f, void *pv, size_t size, > > >> + VMStateField *field) > > >> { > > >> uint8_t *v =3D pv; > > >> qemu_get_buffer(f, v, size); > > >> return 0; > > >> } > > >> =20 > > >> -static void put_buffer(QEMUFile *f, void *pv, size_t size) > > >> +static void put_buffer(QEMUFile *f, void *pv, size_t size, VMStateF= ield *field, > > >> + QJSON *vmdesc) > > >> { > > >> uint8_t *v =3D pv; > > >> qemu_put_buffer(f, v, size); > > >> @@ -846,7 +866,8 @@ const VMStateInfo vmstate_info_buffer =3D { > > >> /* unused buffers: space that was used for some fields that are > > >> not useful anymore */ > > >> =20 > > >> -static int get_unused_buffer(QEMUFile *f, void *pv, size_t size) > > >> +static int get_unused_buffer(QEMUFile *f, void *pv, size_t size, > > >> + VMStateField *field) > > >> { > > >> uint8_t buf[1024]; > > >> int block_len; > > >> @@ -859,7 +880,8 @@ static int get_unused_buffer(QEMUFile *f, void *= pv, size_t size) > > >> return 0; > > >> } > > >> =20 > > >> -static void put_unused_buffer(QEMUFile *f, void *pv, size_t size) > > >> +static void put_unused_buffer(QEMUFile *f, void *pv, size_t size, > > >> + VMStateField *field, QJSON *vmdesc) > > >> { > > >> static const uint8_t buf[1024]; > > >> int block_len; > > >> @@ -884,7 +906,7 @@ const VMStateInfo vmstate_info_unused_buffer =3D= { > > >> */ > > >> /* This is the number of 64 bit words sent over the wire */ > > >> #define BITS_TO_U64S(nr) DIV_ROUND_UP(nr, 64) > > >> -static int get_bitmap(QEMUFile *f, void *pv, size_t size) > > >> +static int get_bitmap(QEMUFile *f, void *pv, size_t size, VMStateFi= eld *field) > > >> { > > >> unsigned long *bmp =3D pv; > > >> int i, idx =3D 0; > > >> @@ -898,7 +920,8 @@ static int get_bitmap(QEMUFile *f, void *pv, siz= e_t size) > > >> return 0; > > >> } > > >> =20 > > >> -static void put_bitmap(QEMUFile *f, void *pv, size_t size) > > >> +static void put_bitmap(QEMUFile *f, void *pv, size_t size, VMStateF= ield *field, > > >> + QJSON *vmdesc) > > >> { > > >> unsigned long *bmp =3D pv; > > >> int i, idx =3D 0; > > >> diff --git a/target-alpha/machine.c b/target-alpha/machine.c > > >> index 710b783..48e3278 100644 > > >> --- a/target-alpha/machine.c > > >> +++ b/target-alpha/machine.c > > >> @@ -5,14 +5,15 @@ > > >> #include "hw/boards.h" > > >> #include "migration/cpu.h" > > >> =20 > > >> -static int get_fpcr(QEMUFile *f, void *opaque, size_t size) > > >> +static int get_fpcr(QEMUFile *f, void *opaque, size_t size, VMState= Field *field) > > >> { > > >> CPUAlphaState *env =3D opaque; > > >> cpu_alpha_store_fpcr(env, qemu_get_be64(f)); > > >> return 0; > > >> } > > >> =20 > > >> -static void put_fpcr(QEMUFile *f, void *opaque, size_t size) > > >> +static void put_fpcr(QEMUFile *f, void *opaque, size_t size, > > >> + VMStateField *field, QJSON *vmdesc) > > >> { > > >> CPUAlphaState *env =3D opaque; > > >> qemu_put_be64(f, cpu_alpha_load_fpcr(env)); > > >> diff --git a/target-arm/machine.c b/target-arm/machine.c > > >> index 7a6ca31..41a0de9 100644 > > >> --- a/target-arm/machine.c > > >> +++ b/target-arm/machine.c > > >> @@ -17,7 +17,8 @@ static bool vfp_needed(void *opaque) > > >> return arm_feature(env, ARM_FEATURE_VFP); > > >> } > > >> =20 > > >> -static int get_fpscr(QEMUFile *f, void *opaque, size_t size) > > >> +static int get_fpscr(QEMUFile *f, void *opaque, size_t size, > > >> + VMStateField *field) > > >> { > > >> ARMCPU *cpu =3D opaque; > > >> CPUARMState *env =3D &cpu->env; > > >> @@ -27,7 +28,8 @@ static int get_fpscr(QEMUFile *f, void *opaque, si= ze_t size) > > >> return 0; > > >> } > > >> =20 > > >> -static void put_fpscr(QEMUFile *f, void *opaque, size_t size) > > >> +static void put_fpscr(QEMUFile *f, void *opaque, size_t size, > > >> + VMStateField *field, QJSON *vmdesc) > > >> { > > >> ARMCPU *cpu =3D opaque; > > >> CPUARMState *env =3D &cpu->env; > > >> @@ -163,7 +165,8 @@ static const VMStateDescription vmstate_pmsav7 = =3D { > > >> } > > >> }; > > >> =20 > > >> -static int get_cpsr(QEMUFile *f, void *opaque, size_t size) > > >> +static int get_cpsr(QEMUFile *f, void *opaque, size_t size, > > >> + VMStateField *field) > > >> { > > >> ARMCPU *cpu =3D opaque; > > >> CPUARMState *env =3D &cpu->env; > > >> @@ -180,7 +183,8 @@ static int get_cpsr(QEMUFile *f, void *opaque, s= ize_t size) > > >> return 0; > > >> } > > >> =20 > > >> -static void put_cpsr(QEMUFile *f, void *opaque, size_t size) > > >> +static void put_cpsr(QEMUFile *f, void *opaque, size_t size, > > >> + VMStateField *field, QJSON *vmdesc) > > >> { > > >> ARMCPU *cpu =3D opaque; > > >> CPUARMState *env =3D &cpu->env; > > >> diff --git a/target-i386/machine.c b/target-i386/machine.c > > >> index 71c0e4d..1df19e2 100644 > > >> --- a/target-i386/machine.c > > >> +++ b/target-i386/machine.c > > >> @@ -139,7 +139,8 @@ static const VMStateDescription vmstate_mtrr_var= =3D { > > >> #define VMSTATE_MTRR_VARS(_field, _state, _n, _v) = \ > > >> VMSTATE_STRUCT_ARRAY(_field, _state, _n, _v, vmstate_mtrr_var, = MTRRVar) > > >> =20 > > >> -static void put_fpreg_error(QEMUFile *f, void *opaque, size_t size) > > >> +static void put_fpreg_error(QEMUFile *f, void *opaque, size_t size, > > >> + VMStateField *field, QJSON *vmdesc) > > >> { > > >> fprintf(stderr, "call put_fpreg() with invalid arguments\n"); > > >> exit(0); > > >> @@ -167,7 +168,8 @@ static void fp64_to_fp80(union x86_longdouble *p= , uint64_t temp) > > >> p->exp =3D e; > > >> } > > >> =20 > > >> -static int get_fpreg(QEMUFile *f, void *opaque, size_t size) > > >> +static int get_fpreg(QEMUFile *f, void *opaque, size_t size, > > >> + VMStateField *field) > > >> { > > >> FPReg *fp_reg =3D opaque; > > >> uint64_t mant; > > >> @@ -179,7 +181,8 @@ static int get_fpreg(QEMUFile *f, void *opaque, = size_t size) > > >> return 0; > > >> } > > >> =20 > > >> -static void put_fpreg(QEMUFile *f, void *opaque, size_t size) > > >> +static void put_fpreg(QEMUFile *f, void *opaque, size_t size, > > >> + VMStateField *field, QJSON *vmdesc) > > >> { > > >> FPReg *fp_reg =3D opaque; > > >> uint64_t mant; > > >> @@ -197,7 +200,8 @@ static const VMStateInfo vmstate_fpreg =3D { > > >> .put =3D put_fpreg, > > >> }; > > >> =20 > > >> -static int get_fpreg_1_mmx(QEMUFile *f, void *opaque, size_t size) > > >> +static int get_fpreg_1_mmx(QEMUFile *f, void *opaque, size_t size, > > >> + VMStateField *field) > > >> { > > >> union x86_longdouble *p =3D opaque; > > >> uint64_t mant; > > >> @@ -214,7 +218,8 @@ static const VMStateInfo vmstate_fpreg_1_mmx =3D= { > > >> .put =3D put_fpreg_error, > > >> }; > > >> =20 > > >> -static int get_fpreg_1_no_mmx(QEMUFile *f, void *opaque, size_t siz= e) > > >> +static int get_fpreg_1_no_mmx(QEMUFile *f, void *opaque, size_t siz= e, > > >> + VMStateField *field) > > >> { > > >> union x86_longdouble *p =3D opaque; > > >> uint64_t mant; > > >> @@ -276,14 +281,16 @@ static bool less_than_7(void *opaque, int vers= ion_id) > > >> return version_id < 7; > > >> } > > >> =20 > > >> -static int get_uint64_as_uint32(QEMUFile *f, void *pv, size_t size) > > >> +static int get_uint64_as_uint32(QEMUFile *f, void *pv, size_t size, > > >> + VMStateField *field) > > >> { > > >> uint64_t *v =3D pv; > > >> *v =3D qemu_get_be32(f); > > >> return 0; > > >> } > > >> =20 > > >> -static void put_uint64_as_uint32(QEMUFile *f, void *pv, size_t size) > > >> +static void put_uint64_as_uint32(QEMUFile *f, void *pv, size_t size, > > >> + VMStateField *field, QJSON *vmdesc) > > >> { > > >> uint64_t *v =3D pv; > > >> qemu_put_be32(f, *v); > > >> diff --git a/target-mips/machine.c b/target-mips/machine.c > > >> index a27f2f1..179084c 100644 > > >> --- a/target-mips/machine.c > > >> +++ b/target-mips/machine.c > > >> @@ -20,7 +20,7 @@ static int cpu_post_load(void *opaque, int version= _id) > > >> =20 > > >> /* FPU state */ > > >> =20 > > >> -static int get_fpr(QEMUFile *f, void *pv, size_t size) > > >> +static int get_fpr(QEMUFile *f, void *pv, size_t size, VMStateField= *field) > > >> { > > >> int i; > > >> fpr_t *v =3D pv; > > >> @@ -31,7 +31,8 @@ static int get_fpr(QEMUFile *f, void *pv, size_t s= ize) > > >> return 0; > > >> } > > >> =20 > > >> -static void put_fpr(QEMUFile *f, void *pv, size_t size) > > >> +static void put_fpr(QEMUFile *f, void *pv, size_t size, VMStateFiel= d *field, > > >> + QJSON *vmdesc) > > >> { > > >> int i; > > >> fpr_t *v =3D pv; > > >> @@ -125,7 +126,7 @@ const VMStateDescription vmstate_mvp =3D { > > >> =20 > > >> /* TLB state */ > > >> =20 > > >> -static int get_tlb(QEMUFile *f, void *pv, size_t size) > > >> +static int get_tlb(QEMUFile *f, void *pv, size_t size, VMStateField= *field) > > >> { > > >> r4k_tlb_t *v =3D pv; > > >> uint16_t flags; > > >> @@ -152,7 +153,8 @@ static int get_tlb(QEMUFile *f, void *pv, size_t= size) > > >> return 0; > > >> } > > >> =20 > > >> -static void put_tlb(QEMUFile *f, void *pv, size_t size) > > >> +static void put_tlb(QEMUFile *f, void *pv, size_t size, VMStateFiel= d *field, > > >> + QJSON *vmdesc) > > >> { > > >> r4k_tlb_t *v =3D pv; > > >> =20 > > >> diff --git a/target-ppc/machine.c b/target-ppc/machine.c > > >> index 4820f22..0e1822c 100644 > > >> --- a/target-ppc/machine.c > > >> +++ b/target-ppc/machine.c > > >> @@ -106,7 +106,7 @@ static int cpu_load_old(QEMUFile *f, void *opaqu= e, int version_id) > > >> return 0; > > >> } > > >> =20 > > >> -static int get_avr(QEMUFile *f, void *pv, size_t size) > > >> +static int get_avr(QEMUFile *f, void *pv, size_t size, VMStateField= *field) > > >> { > > >> ppc_avr_t *v =3D pv; > > >> =20 > > >> @@ -116,7 +116,8 @@ static int get_avr(QEMUFile *f, void *pv, size_t= size) > > >> return 0; > > >> } > > >> =20 > > >> -static void put_avr(QEMUFile *f, void *pv, size_t size) > > >> +static void put_avr(QEMUFile *f, void *pv, size_t size, VMStateFiel= d *field, > > >> + QJSON *vmdesc) > > >> { > > >> ppc_avr_t *v =3D pv; > > >> =20 > > >> @@ -324,7 +325,7 @@ static const VMStateDescription vmstate_sr =3D { > > >> }; > > >> =20 > > >> #ifdef TARGET_PPC64 > > >> -static int get_slbe(QEMUFile *f, void *pv, size_t size) > > >> +static int get_slbe(QEMUFile *f, void *pv, size_t size, VMStateFiel= d *field) > > >> { > > >> ppc_slb_t *v =3D pv; > > >> =20 > > >> @@ -334,7 +335,8 @@ static int get_slbe(QEMUFile *f, void *pv, size_= t size) > > >> return 0; > > >> } > > >> =20 > > >> -static void put_slbe(QEMUFile *f, void *pv, size_t size) > > >> +static void put_slbe(QEMUFile *f, void *pv, size_t size, VMStateFie= ld *field, > > >> + QJSON *vmdesc) > > >> { > > >> ppc_slb_t *v =3D pv; > > >> =20 > > >> diff --git a/target-sparc/machine.c b/target-sparc/machine.c > > >> index 59c92f7..3194e03 100644 > > >> --- a/target-sparc/machine.c > > >> +++ b/target-sparc/machine.c > > >> @@ -59,7 +59,7 @@ static const VMStateDescription vmstate_tlb_entry = =3D { > > >> }; > > >> #endif > > >> =20 > > >> -static int get_psr(QEMUFile *f, void *opaque, size_t size) > > >> +static int get_psr(QEMUFile *f, void *opaque, size_t size, VMStateF= ield *field) > > >> { > > >> SPARCCPU *cpu =3D opaque; > > >> CPUSPARCState *env =3D &cpu->env; > > >> @@ -72,7 +72,8 @@ static int get_psr(QEMUFile *f, void *opaque, size= _t size) > > >> return 0; > > >> } > > >> =20 > > >> -static void put_psr(QEMUFile *f, void *opaque, size_t size) > > >> +static void put_psr(QEMUFile *f, void *opaque, size_t size, VMState= Field *field, > > >> + QJSON *vmdesc) > > >> { > > >> SPARCCPU *cpu =3D opaque; > > >> CPUSPARCState *env =3D &cpu->env; > > >> > > >> > >=20 --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --kvUQC+jR9YzypDnK Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX+yDrAAoJEGw4ysog2bOSSZMP/35EGU0Z0UztMYlkFxmkV88o mROgx/jmz4xBHPw1NoRZzc4Utp6O3Dx+1pCPdIOCI+ghWudENKQeQhLKaTBvIMMU tq5b+PoeWLJ2OozmKQ3Hgjsp/Vty7m/M2QJ+zBhf4mschMcD91tIgDHo1Ji/43yC +HAIdOY8LPle0VLB9Tl2UwFNuTzQ2w9Qg2BfGgSHrMoXDeehLUBD1103yr22jN1H hZyDCjFAHw8p6zxmCB2Ejcou+11z4WFJx4IAIId39dZ+kJGMap9Iw2F51sQsxkq1 9TxQthje1LNVqG4K7wU/G386L+eOx2FaQW/Kqvlw57oTRm8Lb5Hhn4mex3n1MNMX IYMPIedEwoVKGT7uKVXsCo1AKQLPiiSOP/fVebSzCZ+B0iH6i3zDthIL73eq1a3W dmiQKcFhiBQG78a6101+CsZRtl8ooxZUnekuBAkeRhbG7AYpuqID8IN/gMoO//pN d+VAEvhgOWDooE6g5D2DA1VzhnDzT5m3hNb6ha6o5YFmaiUR2oukqpocuwFU3NWi mJfoHwD8gQvcanoHxoc5TUIL9l5BYcXxRElGxQl/AkwMR4lPHfZ90wcWEtZWcMTv g0Zop1daxVGIqchIpO0Mw0s6CG2UhIR8ZNOZ5+RjIl9ATYpV4IjHvWCmKnakLHnl uzNIqZC8DESjmP7zKtCo =d+Ju -----END PGP SIGNATURE----- --kvUQC+jR9YzypDnK--