[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [QEMU PATCH v13 1/4] migration: extend VMStateInfo
|
From: |
Jianjun Duan |
|
Subject: |
Re: [Qemu-ppc] [QEMU PATCH v13 1/4] migration: extend VMStateInfo |
|
Date: |
Wed, 23 Nov 2016 09:46:42 -0800 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 |
On 11/23/2016 08:29 AM, Dr. David Alan Gilbert wrote:
> * Jianjun Duan (address@hidden) 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. put now
>> will return int type.
>>
>> Signed-off-by: Jianjun Duan <address@hidden>
>> ---
>> hw/display/virtio-gpu.c | 8 +++-
>> hw/intc/s390_flic_kvm.c | 8 +++-
>> hw/net/vmxnet3.c | 24 +++++++---
>> hw/nvram/eeprom93xx.c | 8 +++-
>> hw/nvram/fw_cfg.c | 8 +++-
>> hw/pci/msix.c | 8 +++-
>> hw/pci/pci.c | 16 +++++--
>> hw/pci/shpc.c | 7 ++-
>> hw/scsi/scsi-bus.c | 8 +++-
>> hw/timer/twl92230.c | 8 +++-
>> hw/usb/redirect.c | 24 +++++++---
>> hw/virtio/virtio-pci.c | 8 +++-
>> hw/virtio/virtio.c | 15 ++++--
>> include/migration/vmstate.h | 19 ++++++--
>> migration/savevm.c | 7 ++-
>> migration/vmstate.c | 113
>> +++++++++++++++++++++++++++++---------------
>> target-alpha/machine.c | 6 ++-
>> target-arm/machine.c | 14 ++++--
>> target-i386/machine.c | 26 +++++++---
>> target-mips/machine.c | 14 ++++--
>> target-ppc/machine.c | 12 +++--
>> target-sparc/machine.c | 6 ++-
>> 22 files changed, 262 insertions(+), 105 deletions(-)
>>
>
> <snip>
>
>> diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
>> index a657237..e568dcf 100644
>> --- a/hw/usb/redirect.c
>> +++ b/hw/usb/redirect.c
>> @@ -2165,7 +2165,8 @@ static int usbredir_post_load(void *priv, int
>> version_id)
>> }
>>
>> /* For usbredirparser migration */
>> -static void usbredir_put_parser(QEMUFile *f, void *priv, size_t unused)
>> +static int usbredir_put_parser(QEMUFile *f, void *priv, size_t unused,
>> + VMStateField *field, QJSON *vmdesc)
>> {
>> USBRedirDevice *dev = priv;
>> uint8_t *data;
>> @@ -2183,9 +2184,12 @@ static void usbredir_put_parser(QEMUFile *f, void
>> *priv, size_t unused)
>> qemu_put_buffer(f, data, len);
>>
>> free(data);
>> +
>> + return 0;
>> }
>
> Fails to build; note there's another return a few lines earlier.
>
Thanks Dave. Didn't catch it.
Jianjun
> Dave
>
>>
>> -static int usbredir_get_parser(QEMUFile *f, void *priv, size_t unused)
>> +static int usbredir_get_parser(QEMUFile *f, void *priv, size_t unused,
>> + VMStateField *field)
>> {
>> USBRedirDevice *dev = priv;
>> uint8_t *data;
>> @@ -2228,7 +2232,8 @@ static const VMStateInfo usbredir_parser_vmstate_info
>> = {
>>
>>
>> /* For buffered packets (iso/irq) queue migration */
>> -static void usbredir_put_bufpq(QEMUFile *f, void *priv, size_t unused)
>> +static int usbredir_put_bufpq(QEMUFile *f, void *priv, size_t unused,
>> + VMStateField *field, QJSON *vmdesc)
>> {
>> struct endp_data *endp = priv;
>> USBRedirDevice *dev = endp->dev;
>> @@ -2246,9 +2251,12 @@ static void usbredir_put_bufpq(QEMUFile *f, void
>> *priv, size_t unused)
>> i++;
>> }
>> assert(i == endp->bufpq_size);
>> +
>> + return 0;
>> }
>>
>> -static int usbredir_get_bufpq(QEMUFile *f, void *priv, size_t unused)
>> +static int usbredir_get_bufpq(QEMUFile *f, void *priv, size_t unused,
>> + VMStateField *field)
>> {
>> struct endp_data *endp = priv;
>> USBRedirDevice *dev = endp->dev;
>> @@ -2351,7 +2359,8 @@ static const VMStateDescription usbredir_ep_vmstate = {
>>
>>
>> /* For PacketIdQueue migration */
>> -static void usbredir_put_packet_id_q(QEMUFile *f, void *priv, size_t unused)
>> +static int usbredir_put_packet_id_q(QEMUFile *f, void *priv, size_t unused,
>> + VMStateField *field, QJSON *vmdesc)
>> {
>> struct PacketIdQueue *q = priv;
>> USBRedirDevice *dev = q->dev;
>> @@ -2365,9 +2374,12 @@ static void usbredir_put_packet_id_q(QEMUFile *f,
>> void *priv, size_t unused)
>> remain--;
>> }
>> assert(remain == 0);
>> +
>> + return 0;
>> }
>>
>> -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 = priv;
>> USBRedirDevice *dev = q->dev;
>> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
>> index 97b32fe..001f4b4 100644
>> --- a/hw/virtio/virtio-pci.c
>> +++ b/hw/virtio/virtio-pci.c
>> @@ -108,7 +108,8 @@ static bool virtio_pci_has_extra_state(DeviceState *d)
>> return proxy->flags & VIRTIO_PCI_FLAG_MIGRATE_EXTRA;
>> }
>>
>> -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 = pv;
>> int i;
>> @@ -137,7 +138,8 @@ static void
>> virtio_pci_save_modern_queue_state(VirtIOPCIQueue *vq,
>> qemu_put_be32(f, vq->used[1]);
>> }
>>
>> -static void put_virtio_pci_modern_state(QEMUFile *f, void *pv, size_t size)
>> +static int put_virtio_pci_modern_state(QEMUFile *f, void *pv, size_t size,
>> + VMStateField *field, QJSON *vmdesc)
>> {
>> VirtIOPCIProxy *proxy = pv;
>> int i;
>> @@ -149,6 +151,8 @@ static void put_virtio_pci_modern_state(QEMUFile *f,
>> void *pv, size_t size)
>> for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
>> virtio_pci_save_modern_queue_state(&proxy->vqs[i], f);
>> }
>> +
>> + return 0;
>> }
>>
>> static const VMStateInfo vmstate_info_virtio_pci_modern_state = {
>> diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
>> index 55a00cd..7fbecca 100644
>> --- a/hw/virtio/virtio.c
>> +++ b/hw/virtio/virtio.c
>> @@ -1470,7 +1470,8 @@ static const VMStateDescription
>> vmstate_virtio_ringsize = {
>> }
>> };
>>
>> -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 = pv;
>> BusState *qbus = qdev_get_parent_bus(DEVICE(vdev));
>> @@ -1483,13 +1484,15 @@ static int get_extra_state(QEMUFile *f, void *pv,
>> size_t size)
>> }
>> }
>>
>> -static void put_extra_state(QEMUFile *f, void *pv, size_t size)
>> +static int put_extra_state(QEMUFile *f, void *pv, size_t size,
>> + VMStateField *field, QJSON *vmdesc)
>> {
>> VirtIODevice *vdev = pv;
>> BusState *qbus = qdev_get_parent_bus(DEVICE(vdev));
>> VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
>>
>> k->save_extra_state(qbus->parent, f);
>> + return 0;
>> }
>>
>> static const VMStateInfo vmstate_info_extra_state = {
>> @@ -1624,13 +1627,17 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f)
>> }
>>
>> /* A wrapper for use as a VMState .put function */
>> -static void virtio_device_put(QEMUFile *f, void *opaque, size_t size)
>> +static int virtio_device_put(QEMUFile *f, void *opaque, size_t size,
>> + VMStateField *field, QJSON *vmdesc)
>> {
>> virtio_save(VIRTIO_DEVICE(opaque), f);
>> +
>> + return 0;
>> }
>>
>> /* A wrapper for use as a VMState .get function */
>> -static int virtio_device_get(QEMUFile *f, void *opaque, size_t size)
>> +static int virtio_device_get(QEMUFile *f, void *opaque, size_t size,
>> + VMStateField *field)
>> {
>> VirtIODevice *vdev = VIRTIO_DEVICE(opaque);
>> DeviceClass *dc = DEVICE_CLASS(VIRTIO_DEVICE_GET_CLASS(vdev));
>> diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
>> index 1638ee5..eafc8f2 100644
>> --- a/include/migration/vmstate.h
>> +++ b/include/migration/vmstate.h
>> @@ -81,11 +81,20 @@ void unregister_savevm(DeviceState *dev, const char
>> *idstr, void *opaque);
>>
>> typedef struct VMStateInfo VMStateInfo;
>> typedef struct VMStateDescription VMStateDescription;
>> -
>> +typedef struct VMStateField VMStateField;
>> +
>> +/* VMStateInfo allows customized migration of objects that don't fit in
>> + * any category in VMStateFlags. Additional information is always passed
>> + * into get and put in terms of field and vmdesc parameters. However
>> + * these two parameters should only be used in cases when customized
>> + * handling is needed, such as QTAILQ. For primitive data types such as
>> + * integer, field and vmdesc parameters should be ignored inside get/put.
>> + */
>> 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 *field);
>> + int (*put)(QEMUFile *f, void *pv, size_t size, VMStateField *field,
>> + QJSON *vmdesc);
>> };
>>
>> enum VMStateFlags {
>> @@ -186,7 +195,7 @@ enum VMStateFlags {
>> VMS_MULTIPLY_ELEMENTS = 0x4000,
>> };
>>
>> -typedef struct {
>> +struct VMStateField {
>> const char *name;
>> size_t offset;
>> size_t size;
>> @@ -199,7 +208,7 @@ typedef struct {
>> const VMStateDescription *vmsd;
>> int version_id;
>> bool (*field_exists)(void *opaque, int version_id);
>> -} VMStateField;
>> +};
>>
>> struct VMStateDescription {
>> const char *name;
>> diff --git a/migration/savevm.c b/migration/savevm.c
>> index 0363372..785b6d6 100644
>> --- a/migration/savevm.c
>> +++ b/migration/savevm.c
>> @@ -220,17 +220,20 @@ void timer_get(QEMUFile *f, QEMUTimer *ts)
>> * Not in vmstate.c to not add qemu-timer.c as dependency to vmstate.c
>> */
>>
>> -static int get_timer(QEMUFile *f, void *pv, size_t size)
>> +static int get_timer(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field)
>> {
>> QEMUTimer *v = pv;
>> timer_get(f, v);
>> return 0;
>> }
>>
>> -static void put_timer(QEMUFile *f, void *pv, size_t size)
>> +static int put_timer(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field,
>> + QJSON *vmdesc)
>> {
>> QEMUTimer *v = pv;
>> timer_put(f, v);
>> +
>> + return 0;
>> }
>>
>> const VMStateInfo vmstate_info_timer = {
>> diff --git a/migration/vmstate.c b/migration/vmstate.c
>> index 0bc9f35..7b4bd6e 100644
>> --- a/migration/vmstate.c
>> +++ b/migration/vmstate.c
>> @@ -6,6 +6,7 @@
>> #include "qemu/bitops.h"
>> #include "qemu/error-report.h"
>> #include "trace.h"
>> +#include "migration/qjson.h"
>>
>> static void vmstate_subsection_save(QEMUFile *f, const VMStateDescription
>> *vmsd,
>> void *opaque, QJSON *vmdesc);
>> @@ -122,8 +123,7 @@ int vmstate_load_state(QEMUFile *f, const
>> VMStateDescription *vmsd,
>> ret = vmstate_load_state(f, field->vmsd, addr,
>> field->vmsd->version_id);
>> } else {
>> - ret = field->info->get(f, addr, size);
>> -
>> + ret = field->info->get(f, addr, size, field);
>> }
>> if (ret >= 0) {
>> ret = qemu_file_get_error(f);
>> @@ -330,7 +330,7 @@ void vmstate_save_state(QEMUFile *f, const
>> VMStateDescription *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, field, vmdesc_loop);
>> }
>>
>> written_bytes = qemu_ftell_fast(f) - old_offset;
>> @@ -463,17 +463,19 @@ static void vmstate_subsection_save(QEMUFile *f, const
>> VMStateDescription *vmsd,
>>
>> /* bool */
>>
>> -static int get_bool(QEMUFile *f, void *pv, size_t size)
>> +static int get_bool(QEMUFile *f, void *pv, size_t size, VMStateField *field)
>> {
>> bool *v = pv;
>> *v = qemu_get_byte(f);
>> return 0;
>> }
>>
>> -static void put_bool(QEMUFile *f, void *pv, size_t size)
>> +static int put_bool(QEMUFile *f, void *pv, size_t size, VMStateField *field,
>> + QJSON *vmdesc)
>> {
>> bool *v = pv;
>> qemu_put_byte(f, *v);
>> + return 0;
>> }
>>
>> const VMStateInfo vmstate_info_bool = {
>> @@ -484,17 +486,19 @@ const VMStateInfo vmstate_info_bool = {
>>
>> /* 8 bit int */
>>
>> -static int get_int8(QEMUFile *f, void *pv, size_t size)
>> +static int get_int8(QEMUFile *f, void *pv, size_t size, VMStateField *field)
>> {
>> int8_t *v = pv;
>> qemu_get_s8s(f, v);
>> return 0;
>> }
>>
>> -static void put_int8(QEMUFile *f, void *pv, size_t size)
>> +static int put_int8(QEMUFile *f, void *pv, size_t size, VMStateField *field,
>> + QJSON *vmdesc)
>> {
>> int8_t *v = pv;
>> qemu_put_s8s(f, v);
>> + return 0;
>> }
>>
>> const VMStateInfo vmstate_info_int8 = {
>> @@ -505,17 +509,19 @@ const VMStateInfo vmstate_info_int8 = {
>>
>> /* 16 bit int */
>>
>> -static int get_int16(QEMUFile *f, void *pv, size_t size)
>> +static int get_int16(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field)
>> {
>> int16_t *v = pv;
>> qemu_get_sbe16s(f, v);
>> return 0;
>> }
>>
>> -static void put_int16(QEMUFile *f, void *pv, size_t size)
>> +static int put_int16(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field,
>> + QJSON *vmdesc)
>> {
>> int16_t *v = pv;
>> qemu_put_sbe16s(f, v);
>> + return 0;
>> }
>>
>> const VMStateInfo vmstate_info_int16 = {
>> @@ -526,17 +532,19 @@ const VMStateInfo vmstate_info_int16 = {
>>
>> /* 32 bit int */
>>
>> -static int get_int32(QEMUFile *f, void *pv, size_t size)
>> +static int get_int32(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field)
>> {
>> int32_t *v = pv;
>> qemu_get_sbe32s(f, v);
>> return 0;
>> }
>>
>> -static void put_int32(QEMUFile *f, void *pv, size_t size)
>> +static int put_int32(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field,
>> + QJSON *vmdesc)
>> {
>> int32_t *v = pv;
>> qemu_put_sbe32s(f, v);
>> + return 0;
>> }
>>
>> const VMStateInfo vmstate_info_int32 = {
>> @@ -548,7 +556,8 @@ const VMStateInfo vmstate_info_int32 = {
>> /* 32 bit int. See that the received value is the same than the one
>> in the field */
>>
>> -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 = pv;
>> int32_t v2;
>> @@ -571,7 +580,7 @@ const VMStateInfo vmstate_info_int32_equal = {
>> * and less than or equal to the one in the field.
>> */
>>
>> -static int get_int32_le(QEMUFile *f, void *pv, size_t size)
>> +static int get_int32_le(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field)
>> {
>> int32_t *cur = pv;
>> int32_t loaded;
>> @@ -595,17 +604,19 @@ const VMStateInfo vmstate_info_int32_le = {
>>
>> /* 64 bit int */
>>
>> -static int get_int64(QEMUFile *f, void *pv, size_t size)
>> +static int get_int64(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field)
>> {
>> int64_t *v = pv;
>> qemu_get_sbe64s(f, v);
>> return 0;
>> }
>>
>> -static void put_int64(QEMUFile *f, void *pv, size_t size)
>> +static int put_int64(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field,
>> + QJSON *vmdesc)
>> {
>> int64_t *v = pv;
>> qemu_put_sbe64s(f, v);
>> + return 0;
>> }
>>
>> const VMStateInfo vmstate_info_int64 = {
>> @@ -616,17 +627,19 @@ const VMStateInfo vmstate_info_int64 = {
>>
>> /* 8 bit unsigned int */
>>
>> -static int get_uint8(QEMUFile *f, void *pv, size_t size)
>> +static int get_uint8(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field)
>> {
>> uint8_t *v = pv;
>> qemu_get_8s(f, v);
>> return 0;
>> }
>>
>> -static void put_uint8(QEMUFile *f, void *pv, size_t size)
>> +static int put_uint8(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field,
>> + QJSON *vmdesc)
>> {
>> uint8_t *v = pv;
>> qemu_put_8s(f, v);
>> + return 0;
>> }
>>
>> const VMStateInfo vmstate_info_uint8 = {
>> @@ -637,17 +650,19 @@ const VMStateInfo vmstate_info_uint8 = {
>>
>> /* 16 bit unsigned int */
>>
>> -static int get_uint16(QEMUFile *f, void *pv, size_t size)
>> +static int get_uint16(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field)
>> {
>> uint16_t *v = pv;
>> qemu_get_be16s(f, v);
>> return 0;
>> }
>>
>> -static void put_uint16(QEMUFile *f, void *pv, size_t size)
>> +static int put_uint16(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field,
>> + QJSON *vmdesc)
>> {
>> uint16_t *v = pv;
>> qemu_put_be16s(f, v);
>> + return 0;
>> }
>>
>> const VMStateInfo vmstate_info_uint16 = {
>> @@ -658,17 +673,19 @@ const VMStateInfo vmstate_info_uint16 = {
>>
>> /* 32 bit unsigned int */
>>
>> -static int get_uint32(QEMUFile *f, void *pv, size_t size)
>> +static int get_uint32(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field)
>> {
>> uint32_t *v = pv;
>> qemu_get_be32s(f, v);
>> return 0;
>> }
>>
>> -static void put_uint32(QEMUFile *f, void *pv, size_t size)
>> +static int put_uint32(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field,
>> + QJSON *vmdesc)
>> {
>> uint32_t *v = pv;
>> qemu_put_be32s(f, v);
>> + return 0;
>> }
>>
>> const VMStateInfo vmstate_info_uint32 = {
>> @@ -680,7 +697,8 @@ const VMStateInfo vmstate_info_uint32 = {
>> /* 32 bit uint. See that the received value is the same than the one
>> in the field */
>>
>> -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 = pv;
>> uint32_t v2;
>> @@ -701,17 +719,19 @@ const VMStateInfo vmstate_info_uint32_equal = {
>>
>> /* 64 bit unsigned int */
>>
>> -static int get_uint64(QEMUFile *f, void *pv, size_t size)
>> +static int get_uint64(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field)
>> {
>> uint64_t *v = pv;
>> qemu_get_be64s(f, v);
>> return 0;
>> }
>>
>> -static void put_uint64(QEMUFile *f, void *pv, size_t size)
>> +static int put_uint64(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field,
>> + QJSON *vmdesc)
>> {
>> uint64_t *v = pv;
>> qemu_put_be64s(f, v);
>> + return 0;
>> }
>>
>> const VMStateInfo vmstate_info_uint64 = {
>> @@ -723,7 +743,8 @@ const VMStateInfo vmstate_info_uint64 = {
>> /* 64 bit unsigned int. See that the received value is the same than the one
>> in the field */
>>
>> -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 = pv;
>> uint64_t v2;
>> @@ -745,7 +766,8 @@ const VMStateInfo vmstate_info_uint64_equal = {
>> /* 8 bit int. See that the received value is the same than the one
>> in the field */
>>
>> -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 = pv;
>> uint8_t v2;
>> @@ -767,7 +789,8 @@ const VMStateInfo vmstate_info_uint8_equal = {
>> /* 16 bit unsigned int int. See that the received value is the same than
>> the one
>> in the field */
>>
>> -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 = pv;
>> uint16_t v2;
>> @@ -788,7 +811,8 @@ const VMStateInfo vmstate_info_uint16_equal = {
>>
>> /* floating point */
>>
>> -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 = pv;
>>
>> @@ -796,11 +820,13 @@ static int get_float64(QEMUFile *f, void *pv, size_t
>> size)
>> return 0;
>> }
>>
>> -static void put_float64(QEMUFile *f, void *pv, size_t size)
>> +static int put_float64(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field,
>> + QJSON *vmdesc)
>> {
>> uint64_t *v = pv;
>>
>> qemu_put_be64(f, float64_val(*v));
>> + return 0;
>> }
>>
>> const VMStateInfo vmstate_info_float64 = {
>> @@ -811,7 +837,8 @@ const VMStateInfo vmstate_info_float64 = {
>>
>> /* CPU_DoubleU type */
>>
>> -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 = pv;
>> qemu_get_be32s(f, &v->l.upper);
>> @@ -819,11 +846,13 @@ static int get_cpudouble(QEMUFile *f, void *pv, size_t
>> size)
>> return 0;
>> }
>>
>> -static void put_cpudouble(QEMUFile *f, void *pv, size_t size)
>> +static int put_cpudouble(QEMUFile *f, void *pv, size_t size,
>> + VMStateField *field, QJSON *vmdesc)
>> {
>> CPU_DoubleU *v = pv;
>> qemu_put_be32s(f, &v->l.upper);
>> qemu_put_be32s(f, &v->l.lower);
>> + return 0;
>> }
>>
>> const VMStateInfo vmstate_info_cpudouble = {
>> @@ -834,17 +863,20 @@ const VMStateInfo vmstate_info_cpudouble = {
>>
>> /* uint8_t buffers */
>>
>> -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 = pv;
>> qemu_get_buffer(f, v, size);
>> return 0;
>> }
>>
>> -static void put_buffer(QEMUFile *f, void *pv, size_t size)
>> +static int put_buffer(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field,
>> + QJSON *vmdesc)
>> {
>> uint8_t *v = pv;
>> qemu_put_buffer(f, v, size);
>> + return 0;
>> }
>>
>> const VMStateInfo vmstate_info_buffer = {
>> @@ -856,7 +888,8 @@ const VMStateInfo vmstate_info_buffer = {
>> /* unused buffers: space that was used for some fields that are
>> not useful anymore */
>>
>> -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;
>> @@ -869,7 +902,8 @@ static int get_unused_buffer(QEMUFile *f, void *pv,
>> size_t size)
>> return 0;
>> }
>>
>> -static void put_unused_buffer(QEMUFile *f, void *pv, size_t size)
>> +static int put_unused_buffer(QEMUFile *f, void *pv, size_t size,
>> + VMStateField *field, QJSON *vmdesc)
>> {
>> static const uint8_t buf[1024];
>> int block_len;
>> @@ -879,6 +913,8 @@ static void put_unused_buffer(QEMUFile *f, void *pv,
>> size_t size)
>> size -= block_len;
>> qemu_put_buffer(f, buf, block_len);
>> }
>> +
>> + return 0;
>> }
>>
>> const VMStateInfo vmstate_info_unused_buffer = {
>> @@ -894,7 +930,7 @@ const VMStateInfo vmstate_info_unused_buffer = {
>> */
>> /* 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, VMStateField
>> *field)
>> {
>> unsigned long *bmp = pv;
>> int i, idx = 0;
>> @@ -908,7 +944,8 @@ static int get_bitmap(QEMUFile *f, void *pv, size_t size)
>> return 0;
>> }
>>
>> -static void put_bitmap(QEMUFile *f, void *pv, size_t size)
>> +static int put_bitmap(QEMUFile *f, void *pv, size_t size, VMStateField
>> *field,
>> + QJSON *vmdesc)
>> {
>> unsigned long *bmp = pv;
>> int i, idx = 0;
>> @@ -919,6 +956,8 @@ static void put_bitmap(QEMUFile *f, void *pv, size_t
>> size)
>> }
>> qemu_put_be64(f, w);
>> }
>> +
>> + return 0;
>> }
>>
>> const VMStateInfo vmstate_info_bitmap = {
>> diff --git a/target-alpha/machine.c b/target-alpha/machine.c
>> index b99a123..a102645 100644
>> --- a/target-alpha/machine.c
>> +++ b/target-alpha/machine.c
>> @@ -5,17 +5,19 @@
>> #include "hw/boards.h"
>> #include "migration/cpu.h"
>>
>> -static int get_fpcr(QEMUFile *f, void *opaque, size_t size)
>> +static int get_fpcr(QEMUFile *f, void *opaque, size_t size, VMStateField
>> *field)
>> {
>> CPUAlphaState *env = opaque;
>> cpu_alpha_store_fpcr(env, qemu_get_be64(f));
>> return 0;
>> }
>>
>> -static void put_fpcr(QEMUFile *f, void *opaque, size_t size)
>> +static int put_fpcr(QEMUFile *f, void *opaque, size_t size,
>> + VMStateField *field, QJSON *vmdesc)
>> {
>> CPUAlphaState *env = opaque;
>> qemu_put_be64(f, cpu_alpha_load_fpcr(env));
>> + return 0;
>> }
>>
>> static const VMStateInfo vmstate_fpcr = {
>> diff --git a/target-arm/machine.c b/target-arm/machine.c
>> index d90943b..487320d 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);
>> }
>>
>> -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 = opaque;
>> CPUARMState *env = &cpu->env;
>> @@ -27,12 +28,14 @@ static int get_fpscr(QEMUFile *f, void *opaque, size_t
>> size)
>> return 0;
>> }
>>
>> -static void put_fpscr(QEMUFile *f, void *opaque, size_t size)
>> +static int put_fpscr(QEMUFile *f, void *opaque, size_t size,
>> + VMStateField *field, QJSON *vmdesc)
>> {
>> ARMCPU *cpu = opaque;
>> CPUARMState *env = &cpu->env;
>>
>> qemu_put_be32(f, vfp_get_fpscr(env));
>> + return 0;
>> }
>>
>> static const VMStateInfo vmstate_fpscr = {
>> @@ -163,7 +166,8 @@ static const VMStateDescription vmstate_pmsav7 = {
>> }
>> };
>>
>> -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 = opaque;
>> CPUARMState *env = &cpu->env;
>> @@ -180,7 +184,8 @@ static int get_cpsr(QEMUFile *f, void *opaque, size_t
>> size)
>> return 0;
>> }
>>
>> -static void put_cpsr(QEMUFile *f, void *opaque, size_t size)
>> +static int put_cpsr(QEMUFile *f, void *opaque, size_t size,
>> + VMStateField *field, QJSON *vmdesc)
>> {
>> ARMCPU *cpu = opaque;
>> CPUARMState *env = &cpu->env;
>> @@ -193,6 +198,7 @@ static void put_cpsr(QEMUFile *f, void *opaque, size_t
>> size)
>> }
>>
>> qemu_put_be32(f, val);
>> + return 0;
>> }
>>
>> static const VMStateInfo vmstate_cpsr = {
>> diff --git a/target-i386/machine.c b/target-i386/machine.c
>> index 760f82b..d70552d 100644
>> --- a/target-i386/machine.c
>> +++ b/target-i386/machine.c
>> @@ -136,10 +136,12 @@ static const VMStateDescription vmstate_mtrr_var = {
>> #define VMSTATE_MTRR_VARS(_field, _state, _n, _v) \
>> VMSTATE_STRUCT_ARRAY(_field, _state, _n, _v, vmstate_mtrr_var, MTRRVar)
>>
>> -static void put_fpreg_error(QEMUFile *f, void *opaque, size_t size)
>> +static int 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);
>> + return 0;
>> }
>>
>> /* XXX: add that in a FPU generic layer */
>> @@ -164,7 +166,8 @@ static void fp64_to_fp80(union x86_longdouble *p,
>> uint64_t temp)
>> p->exp = e;
>> }
>>
>> -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 = opaque;
>> uint64_t mant;
>> @@ -176,7 +179,8 @@ static int get_fpreg(QEMUFile *f, void *opaque, size_t
>> size)
>> return 0;
>> }
>>
>> -static void put_fpreg(QEMUFile *f, void *opaque, size_t size)
>> +static int put_fpreg(QEMUFile *f, void *opaque, size_t size,
>> + VMStateField *field, QJSON *vmdesc)
>> {
>> FPReg *fp_reg = opaque;
>> uint64_t mant;
>> @@ -186,6 +190,8 @@ static void put_fpreg(QEMUFile *f, void *opaque, size_t
>> size)
>> cpu_get_fp80(&mant, &exp, fp_reg->d);
>> qemu_put_be64s(f, &mant);
>> qemu_put_be16s(f, &exp);
>> +
>> + return 0;
>> }
>>
>> static const VMStateInfo vmstate_fpreg = {
>> @@ -194,7 +200,8 @@ static const VMStateInfo vmstate_fpreg = {
>> .put = put_fpreg,
>> };
>>
>> -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 = opaque;
>> uint64_t mant;
>> @@ -211,7 +218,8 @@ static const VMStateInfo vmstate_fpreg_1_mmx = {
>> .put = put_fpreg_error,
>> };
>>
>> -static int get_fpreg_1_no_mmx(QEMUFile *f, void *opaque, size_t size)
>> +static int get_fpreg_1_no_mmx(QEMUFile *f, void *opaque, size_t size,
>> + VMStateField *field)
>> {
>> union x86_longdouble *p = opaque;
>> uint64_t mant;
>> @@ -273,17 +281,21 @@ static bool less_than_7(void *opaque, int version_id)
>> return version_id < 7;
>> }
>>
>> -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 = pv;
>> *v = qemu_get_be32(f);
>> return 0;
>> }
>>
>> -static void put_uint64_as_uint32(QEMUFile *f, void *pv, size_t size)
>> +static int put_uint64_as_uint32(QEMUFile *f, void *pv, size_t size,
>> + VMStateField *field, QJSON *vmdesc)
>> {
>> uint64_t *v = pv;
>> qemu_put_be32(f, *v);
>> +
>> + return 0;
>> }
>>
>> static const VMStateInfo vmstate_hack_uint64_as_uint32 = {
>> diff --git a/target-mips/machine.c b/target-mips/machine.c
>> index d20d948..38c8fe9 100644
>> --- a/target-mips/machine.c
>> +++ b/target-mips/machine.c
>> @@ -19,7 +19,7 @@ static int cpu_post_load(void *opaque, int version_id)
>>
>> /* FPU state */
>>
>> -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 = pv;
>> @@ -30,7 +30,8 @@ static int get_fpr(QEMUFile *f, void *pv, size_t size)
>> return 0;
>> }
>>
>> -static void put_fpr(QEMUFile *f, void *pv, size_t size)
>> +static int put_fpr(QEMUFile *f, void *pv, size_t size, VMStateField *field,
>> + QJSON *vmdesc)
>> {
>> int i;
>> fpr_t *v = pv;
>> @@ -38,6 +39,8 @@ static void put_fpr(QEMUFile *f, void *pv, size_t size)
>> for (i = 0; i < MSA_WRLEN/64; i++) {
>> qemu_put_sbe64s(f, &v->wr.d[i]);
>> }
>> +
>> + return 0;
>> }
>>
>> const VMStateInfo vmstate_info_fpr = {
>> @@ -124,7 +127,7 @@ const VMStateDescription vmstate_mvp = {
>>
>> /* TLB state */
>>
>> -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 = pv;
>> uint16_t flags;
>> @@ -151,7 +154,8 @@ static int get_tlb(QEMUFile *f, void *pv, size_t size)
>> return 0;
>> }
>>
>> -static void put_tlb(QEMUFile *f, void *pv, size_t size)
>> +static int put_tlb(QEMUFile *f, void *pv, size_t size, VMStateField *field,
>> + QJSON *vmdesc)
>> {
>> r4k_tlb_t *v = pv;
>>
>> @@ -175,6 +179,8 @@ static void put_tlb(QEMUFile *f, void *pv, size_t size)
>> qemu_put_be16s(f, &flags);
>> qemu_put_be64s(f, &v->PFN[0]);
>> qemu_put_be64s(f, &v->PFN[1]);
>> +
>> + return 0;
>> }
>>
>> const VMStateInfo vmstate_info_tlb = {
>> diff --git a/target-ppc/machine.c b/target-ppc/machine.c
>> index e43cb6c..3175b5a 100644
>> --- a/target-ppc/machine.c
>> +++ b/target-ppc/machine.c
>> @@ -105,7 +105,7 @@ static int cpu_load_old(QEMUFile *f, void *opaque, int
>> version_id)
>> return 0;
>> }
>>
>> -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 = pv;
>>
>> @@ -115,12 +115,14 @@ static int get_avr(QEMUFile *f, void *pv, size_t size)
>> return 0;
>> }
>>
>> -static void put_avr(QEMUFile *f, void *pv, size_t size)
>> +static int put_avr(QEMUFile *f, void *pv, size_t size, VMStateField *field,
>> + QJSON *vmdesc)
>> {
>> ppc_avr_t *v = pv;
>>
>> qemu_put_be64(f, v->u64[0]);
>> qemu_put_be64(f, v->u64[1]);
>> + return 0;
>> }
>>
>> static const VMStateInfo vmstate_info_avr = {
>> @@ -323,7 +325,7 @@ static const VMStateDescription vmstate_sr = {
>> };
>>
>> #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, VMStateField *field)
>> {
>> ppc_slb_t *v = pv;
>>
>> @@ -333,12 +335,14 @@ static int get_slbe(QEMUFile *f, void *pv, size_t size)
>> return 0;
>> }
>>
>> -static void put_slbe(QEMUFile *f, void *pv, size_t size)
>> +static int put_slbe(QEMUFile *f, void *pv, size_t size, VMStateField *field,
>> + QJSON *vmdesc)
>> {
>> ppc_slb_t *v = pv;
>>
>> qemu_put_be64(f, v->esid);
>> qemu_put_be64(f, v->vsid);
>> + return 0;
>> }
>>
>> static const VMStateInfo vmstate_info_slbe = {
>> diff --git a/target-sparc/machine.c b/target-sparc/machine.c
>> index aea6397..225b382 100644
>> --- a/target-sparc/machine.c
>> +++ b/target-sparc/machine.c
>> @@ -56,7 +56,7 @@ static const VMStateDescription vmstate_tlb_entry = {
>> };
>> #endif
>>
>> -static int get_psr(QEMUFile *f, void *opaque, size_t size)
>> +static int get_psr(QEMUFile *f, void *opaque, size_t size, VMStateField
>> *field)
>> {
>> SPARCCPU *cpu = opaque;
>> CPUSPARCState *env = &cpu->env;
>> @@ -69,7 +69,8 @@ static int get_psr(QEMUFile *f, void *opaque, size_t size)
>> return 0;
>> }
>>
>> -static void put_psr(QEMUFile *f, void *opaque, size_t size)
>> +static int put_psr(QEMUFile *f, void *opaque, size_t size, VMStateField
>> *field,
>> + QJSON *vmdesc)
>> {
>> SPARCCPU *cpu = opaque;
>> CPUSPARCState *env = &cpu->env;
>> @@ -78,6 +79,7 @@ static void put_psr(QEMUFile *f, void *opaque, size_t size)
>> val = cpu_get_psr(env);
>>
>> qemu_put_be32(f, val);
>> + return 0;
>> }
>>
>> static const VMStateInfo vmstate_psr = {
>> --
>> 1.9.1
>>
> --
> Dr. David Alan Gilbert / address@hidden / Manchester, UK
>
- [Qemu-ppc] [QEMU PATCH v13 0/4] migration: migrate QTAILQ, Jianjun Duan, 2016/11/16
- [Qemu-ppc] [QEMU PATCH v13 2/4] migration: migrate QTAILQ, Jianjun Duan, 2016/11/16
- [Qemu-ppc] [QEMU PATCH v13 1/4] migration: extend VMStateInfo, Jianjun Duan, 2016/11/16
- [Qemu-ppc] [QEMU PATCH v13 3/4] tests/migration: Add test for QTAILQ migration, Jianjun Duan, 2016/11/16
- [Qemu-ppc] [QEMU PATCH v13 4/4] migration: add error_report, Jianjun Duan, 2016/11/16
- Re: [Qemu-ppc] [QEMU PATCH v13 0/4] migration: migrate QTAILQ, Jianjun Duan, 2016/11/18