| Message ID | 1477428463-10569-2-git-send-email-duanj@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* 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 <duanj@linux.vnet.ibm.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > hw/display/virtio-gpu.c | 6 ++- > hw/intc/s390_flic_kvm.c | 6 ++- > 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 | 12 +++-- > include/migration/vmstate.h | 15 +++++-- > migration/savevm.c | 5 ++- > migration/vmstate.c | 106 ++++++++++++++++++++++++++++---------------- > 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 ++- > 22 files changed, 198 insertions(+), 104 deletions(-) > > diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c > index fa6fd0e..2a21150 100644 > --- a/hw/display/virtio-gpu.c > +++ b/hw/display/virtio-gpu.c > @@ -987,7 +987,8 @@ static const VMStateDescription vmstate_virtio_gpu_scanouts = { > }, > }; > > -static void virtio_gpu_save(QEMUFile *f, void *opaque, size_t size) > +static void virtio_gpu_save(QEMUFile *f, void *opaque, size_t size, > + VMStateField *field, QJSON *vmdesc) > { > VirtIOGPU *g = opaque; > struct virtio_gpu_simple_resource *res; > @@ -1014,7 +1015,8 @@ static void virtio_gpu_save(QEMUFile *f, void *opaque, size_t size) > vmstate_save_state(f, &vmstate_virtio_gpu_scanouts, g, NULL); > } > > -static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size) > +static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size, > + VMStateField *field) > { > VirtIOGPU *g = opaque; > struct virtio_gpu_simple_resource *res; > diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c > index 21ac2e2..a80a812 100644 > --- a/hw/intc/s390_flic_kvm.c > +++ b/hw/intc/s390_flic_kvm.c > @@ -286,7 +286,8 @@ static void kvm_s390_release_adapter_routes(S390FLICState *fs, > * increase until buffer is sufficient or maxium size is > * reached > */ > -static void kvm_flic_save(QEMUFile *f, void *opaque, size_t size) > +static void kvm_flic_save(QEMUFile *f, void *opaque, size_t size, > + VMStateField *field, QJSON *vmdesc) > { > KVMS390FLICState *flic = opaque; > int len = FLIC_SAVE_INITIAL_SIZE; > @@ -331,7 +332,8 @@ static void kvm_flic_save(QEMUFile *f, void *opaque, size_t size) > * Note: Do nothing when no interrupts where stored > * in QEMUFile > */ > -static int kvm_flic_load(QEMUFile *f, void *opaque, size_t size) > +static int kvm_flic_load(QEMUFile *f, void *opaque, size_t size, > + VMStateField *field) > { > uint64_t len = 0; > uint64_t count = 0; > diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c > index 90f6943..943a960 100644 > --- a/hw/net/vmxnet3.c > +++ b/hw/net/vmxnet3.c > @@ -2450,7 +2450,8 @@ static void vmxnet3_put_tx_stats_to_file(QEMUFile *f, > qemu_put_be64(f, tx_stat->pktsTxDiscard); > } > > -static int vmxnet3_get_txq_descr(QEMUFile *f, void *pv, size_t size) > +static int vmxnet3_get_txq_descr(QEMUFile *f, void *pv, size_t size, > + VMStateField *field) > { > Vmxnet3TxqDescr *r = pv; > > @@ -2464,7 +2465,8 @@ static int vmxnet3_get_txq_descr(QEMUFile *f, void *pv, size_t size) > return 0; > } > > -static void vmxnet3_put_txq_descr(QEMUFile *f, void *pv, size_t size) > +static void vmxnet3_put_txq_descr(QEMUFile *f, void *pv, size_t size, > + VMStateField *field, QJSON *vmdesc) > { > Vmxnet3TxqDescr *r = pv; > > @@ -2511,7 +2513,8 @@ static void vmxnet3_put_rx_stats_to_file(QEMUFile *f, > qemu_put_be64(f, rx_stat->pktsRxError); > } > > -static int vmxnet3_get_rxq_descr(QEMUFile *f, void *pv, size_t size) > +static int vmxnet3_get_rxq_descr(QEMUFile *f, void *pv, size_t size, > + VMStateField *field) > { > Vmxnet3RxqDescr *r = pv; > int i; > @@ -2529,7 +2532,8 @@ static int vmxnet3_get_rxq_descr(QEMUFile *f, void *pv, size_t size) > return 0; > } > > -static void vmxnet3_put_rxq_descr(QEMUFile *f, void *pv, size_t size) > +static void vmxnet3_put_rxq_descr(QEMUFile *f, void *pv, size_t size, > + VMStateField *field, QJSON *vmdesc) > { > Vmxnet3RxqDescr *r = pv; > int i; > @@ -2574,7 +2578,8 @@ static const VMStateInfo rxq_descr_info = { > .put = vmxnet3_put_rxq_descr > }; > > -static int vmxnet3_get_int_state(QEMUFile *f, void *pv, size_t size) > +static int vmxnet3_get_int_state(QEMUFile *f, void *pv, size_t size, > + VMStateField *field) > { > Vmxnet3IntState *r = pv; > > @@ -2585,7 +2590,8 @@ static int vmxnet3_get_int_state(QEMUFile *f, void *pv, size_t size) > return 0; > } > > -static void vmxnet3_put_int_state(QEMUFile *f, void *pv, size_t size) > +static void vmxnet3_put_int_state(QEMUFile *f, void *pv, size_t size, > + VMStateField *field, QJSON *vmdesc) > { > Vmxnet3IntState *r = pv; > > diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c > index 2c16fc2..76d5f41 100644 > --- a/hw/nvram/eeprom93xx.c > +++ b/hw/nvram/eeprom93xx.c > @@ -94,14 +94,16 @@ struct _eeprom_t { > This is a Big hack, but it is how the old state did it. > */ > > -static int get_uint16_from_uint8(QEMUFile *f, void *pv, size_t size) > +static int get_uint16_from_uint8(QEMUFile *f, void *pv, size_t size, > + VMStateField *field) > { > uint16_t *v = pv; > *v = qemu_get_ubyte(f); > return 0; > } > > -static void put_unused(QEMUFile *f, void *pv, size_t size) > +static void put_unused(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > fprintf(stderr, "uint16_from_uint8 is used only for backwards compatibility.\n"); > fprintf(stderr, "Never should be used to write a new state.\n"); > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c > index 92aa563..a8a4a7a 100644 > --- a/hw/nvram/fw_cfg.c > +++ b/hw/nvram/fw_cfg.c > @@ -524,14 +524,16 @@ static void fw_cfg_reset(DeviceState *d) > Or we broke compatibility in the state, or we can't use struct tm > */ > > -static int get_uint32_as_uint16(QEMUFile *f, void *pv, size_t size) > +static int get_uint32_as_uint16(QEMUFile *f, void *pv, size_t size, > + VMStateField *field) > { > uint32_t *v = pv; > *v = qemu_get_be16(f); > return 0; > } > > -static void put_unused(QEMUFile *f, void *pv, size_t size) > +static void put_unused(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > fprintf(stderr, "uint32_as_uint16 is only used for backward compatibility.\n"); > fprintf(stderr, "This functions shouldn't be called.\n"); > diff --git a/hw/pci/msix.c b/hw/pci/msix.c > index 0ec1cb1..69e7a50 100644 > --- a/hw/pci/msix.c > +++ b/hw/pci/msix.c > @@ -587,12 +587,14 @@ void msix_unset_vector_notifiers(PCIDevice *dev) > dev->msix_vector_poll_notifier = NULL; > } > > -static void put_msix_state(QEMUFile *f, void *pv, size_t size) > +static void put_msix_state(QEMUFile *f, void *pv, size_t size, > + VMStateField *field, QJSON *vmdesc) > { > msix_save(pv, f); > } > > -static int get_msix_state(QEMUFile *f, void *pv, size_t size) > +static int get_msix_state(QEMUFile *f, void *pv, size_t size, > + VMStateField *field) > { > msix_load(pv, f); > return 0; > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index 24fae16..08c4547 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -445,7 +445,8 @@ int pci_bus_numa_node(PCIBus *bus) > return PCI_BUS_GET_CLASS(bus)->numa_node(bus); > } > > -static int get_pci_config_device(QEMUFile *f, void *pv, size_t size) > +static int get_pci_config_device(QEMUFile *f, void *pv, size_t size, > + VMStateField *field) > { > PCIDevice *s = container_of(pv, PCIDevice, config); > PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(s); > @@ -484,7 +485,8 @@ static int get_pci_config_device(QEMUFile *f, void *pv, size_t size) > } > > /* just put buffer */ > -static void put_pci_config_device(QEMUFile *f, void *pv, size_t size) > +static void put_pci_config_device(QEMUFile *f, void *pv, size_t size, > + VMStateField *field, QJSON *vmdesc) > { > const uint8_t **v = pv; > assert(size == pci_config_size(container_of(pv, PCIDevice, config))); > @@ -497,7 +499,8 @@ static VMStateInfo vmstate_info_pci_config = { > .put = put_pci_config_device, > }; > > -static int get_pci_irq_state(QEMUFile *f, void *pv, size_t size) > +static int get_pci_irq_state(QEMUFile *f, void *pv, size_t size, > + VMStateField *field) > { > PCIDevice *s = container_of(pv, PCIDevice, irq_state); > uint32_t irq_state[PCI_NUM_PINS]; > @@ -518,7 +521,8 @@ static int get_pci_irq_state(QEMUFile *f, void *pv, size_t size) > return 0; > } > > -static void put_pci_irq_state(QEMUFile *f, void *pv, size_t size) > +static void put_pci_irq_state(QEMUFile *f, void *pv, size_t size, > + VMStateField *field, QJSON *vmdesc) > { > int i; > PCIDevice *s = container_of(pv, PCIDevice, irq_state); > diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c > index 3dcd472..9f82aa6 100644 > --- a/hw/pci/shpc.c > +++ b/hw/pci/shpc.c > @@ -695,13 +695,14 @@ void shpc_cap_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) > shpc_cap_update_dword(d); > } > > -static void shpc_save(QEMUFile *f, void *pv, size_t size) > +static void shpc_save(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > PCIDevice *d = container_of(pv, PCIDevice, shpc); > qemu_put_buffer(f, d->shpc->config, SHPC_SIZEOF(d)); > } > > -static int shpc_load(QEMUFile *f, void *pv, size_t size) > +static int shpc_load(QEMUFile *f, void *pv, size_t size, VMStateField *field) > { > PCIDevice *d = container_of(pv, PCIDevice, shpc); > int ret = qemu_get_buffer(f, d->shpc->config, SHPC_SIZEOF(d)); > diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c > index 297216d..f40c10b 100644 > --- a/hw/scsi/scsi-bus.c > +++ b/hw/scsi/scsi-bus.c > @@ -1945,7 +1945,8 @@ SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int id, int lun) > > /* SCSI request list. For simplicity, pv points to the whole device */ > > -static void put_scsi_requests(QEMUFile *f, void *pv, size_t size) > +static void put_scsi_requests(QEMUFile *f, void *pv, size_t size, > + VMStateField *field, QJSON *vmdesc) > { > SCSIDevice *s = pv; > SCSIBus *bus = DO_UPCAST(SCSIBus, qbus, s->qdev.parent_bus); > @@ -1970,7 +1971,8 @@ static void put_scsi_requests(QEMUFile *f, void *pv, size_t size) > qemu_put_sbyte(f, 0); > } > > -static int get_scsi_requests(QEMUFile *f, void *pv, size_t size) > +static int get_scsi_requests(QEMUFile *f, void *pv, size_t size, > + VMStateField *field) > { > SCSIDevice *s = pv; > SCSIBus *bus = DO_UPCAST(SCSIBus, qbus, s->qdev.parent_bus); > diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c > index 7ba4e9a..95eb7f3 100644 > --- a/hw/timer/twl92230.c > +++ b/hw/timer/twl92230.c > @@ -747,14 +747,16 @@ static int menelaus_rx(I2CSlave *i2c) > Or we broke compatibility in the state, or we can't use struct tm > */ > > -static int get_int32_as_uint16(QEMUFile *f, void *pv, size_t size) > +static int get_int32_as_uint16(QEMUFile *f, void *pv, size_t size, > + VMStateField *field) > { > int *v = pv; > *v = qemu_get_be16(f); > return 0; > } > > -static void put_int32_as_uint16(QEMUFile *f, void *pv, size_t size) > +static void put_int32_as_uint16(QEMUFile *f, void *pv, size_t size, > + VMStateField *field, QJSON *vmdesc) > { > int *v = pv; > qemu_put_be16(f, *v); > diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c > index d4ca026..7f28c3e 100644 > --- a/hw/usb/redirect.c > +++ b/hw/usb/redirect.c > @@ -2158,7 +2158,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 void usbredir_put_parser(QEMUFile *f, void *priv, size_t unused, > + VMStateField *field, QJSON *vmdesc) > { > USBRedirDevice *dev = priv; > uint8_t *data; > @@ -2178,7 +2179,8 @@ static void usbredir_put_parser(QEMUFile *f, void *priv, size_t unused) > free(data); > } > > -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; > @@ -2221,7 +2223,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 void usbredir_put_bufpq(QEMUFile *f, void *priv, size_t unused, > + VMStateField *field, QJSON *vmdesc) > { > struct endp_data *endp = priv; > USBRedirDevice *dev = endp->dev; > @@ -2241,7 +2244,8 @@ static void usbredir_put_bufpq(QEMUFile *f, void *priv, size_t unused) > assert(i == endp->bufpq_size); > } > > -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; > @@ -2344,7 +2348,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 void usbredir_put_packet_id_q(QEMUFile *f, void *priv, size_t unused, > + VMStateField *field, QJSON *vmdesc) > { > struct PacketIdQueue *q = priv; > USBRedirDevice *dev = q->dev; > @@ -2360,7 +2365,8 @@ static void usbredir_put_packet_id_q(QEMUFile *f, void *priv, size_t unused) > assert(remain == 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 06831de..4bd12f0 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 void put_virtio_pci_modern_state(QEMUFile *f, void *pv, size_t size, > + VMStateField *field, QJSON *vmdesc) > { > VirtIOPCIProxy *proxy = pv; > int i; > diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c > index d48d1a9..c799c5c 100644 > --- a/hw/virtio/virtio.c > +++ b/hw/virtio/virtio.c > @@ -1490,7 +1490,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)); > @@ -1503,7 +1504,8 @@ 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 void 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)); > @@ -1640,13 +1642,15 @@ 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 void virtio_device_put(QEMUFile *f, void *opaque, size_t size, > + VMStateField *field, QJSON *vmdesc) > { > virtio_save(VIRTIO_DEVICE(opaque), f); > } > > /* 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..d0e37b5 100644 > --- a/include/migration/vmstate.h > +++ b/include/migration/vmstate.h > @@ -81,11 +81,18 @@ 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 can be passed > + * into get and put in terms of field and vmdesc parameters. > + * 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); > + void (*put)(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc); > }; > > enum VMStateFlags { > @@ -186,7 +193,7 @@ enum VMStateFlags { > VMS_MULTIPLY_ELEMENTS = 0x4000, > }; > > -typedef struct { > +struct VMStateField { > const char *name; > size_t offset; > size_t size; > @@ -199,7 +206,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 33a2911..12b7f8d 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 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 void put_timer(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > QEMUTimer *v = pv; > timer_put(f, v); > diff --git a/migration/vmstate.c b/migration/vmstate.c > index fc29acf..d188afa 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); > @@ -83,6 +84,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, > > trace_vmstate_load_state(vmsd->name, version_id); > if (version_id > vmsd->version_id) { > + error_report("%s %s", vmsd->name, "too new"); > trace_vmstate_load_state_end(vmsd->name, "too new", -EINVAL); > return -EINVAL; > } > @@ -93,6 +95,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, > trace_vmstate_load_state_end(vmsd->name, "old path", ret); > return ret; > } > + error_report("%s %s", vmsd->name, "too old"); > trace_vmstate_load_state_end(vmsd->name, "too old", -EINVAL); > return -EINVAL; > } > @@ -122,8 +125,10 @@ 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); > - > + /* field is always passed in. But it should be ignored by > + * get when not needed. It is only needed in cases* of > + * customized handling, such as migrating QTAILQ. */ > + ret = field->info->get(f, addr, size, field); > } > if (ret >= 0) { > ret = qemu_file_get_error(f); > @@ -328,7 +333,11 @@ 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 and vmdesc_loop are always passed in. But they > + * should be ignored by put when not needed. They are > + * only needed in cases f customized handling, such as > + * migrating QTAILQ. */ > + field->info->put(f, addr, size, field, vmdesc_loop); > } > > written_bytes = qemu_ftell_fast(f) - old_offset; > @@ -461,14 +470,15 @@ 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 void put_bool(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > bool *v = pv; > qemu_put_byte(f, *v); > @@ -482,14 +492,15 @@ 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 void put_int8(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > int8_t *v = pv; > qemu_put_s8s(f, v); > @@ -503,14 +514,15 @@ 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 void put_int16(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > int16_t *v = pv; > qemu_put_sbe16s(f, v); > @@ -524,14 +536,15 @@ 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 void put_int32(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > int32_t *v = pv; > qemu_put_sbe32s(f, v); > @@ -546,7 +559,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; > @@ -568,7 +582,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; > @@ -589,14 +603,15 @@ 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 void put_int64(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > int64_t *v = pv; > qemu_put_sbe64s(f, v); > @@ -610,14 +625,15 @@ 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 void put_uint8(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > uint8_t *v = pv; > qemu_put_8s(f, v); > @@ -631,14 +647,15 @@ 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 void put_uint16(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > uint16_t *v = pv; > qemu_put_be16s(f, v); > @@ -652,14 +669,15 @@ 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 void put_uint32(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > uint32_t *v = pv; > qemu_put_be32s(f, v); > @@ -674,7 +692,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; > @@ -694,14 +713,15 @@ 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 void put_uint64(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > uint64_t *v = pv; > qemu_put_be64s(f, v); > @@ -716,7 +736,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; > @@ -737,7 +758,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; > @@ -758,7 +780,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; > @@ -778,7 +801,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; > > @@ -786,7 +810,8 @@ 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 void put_float64(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > uint64_t *v = pv; > > @@ -801,7 +826,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); > @@ -809,7 +835,8 @@ 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 void put_cpudouble(QEMUFile *f, void *pv, size_t size, > + VMStateField *field, QJSON *vmdesc) > { > CPU_DoubleU *v = pv; > qemu_put_be32s(f, &v->l.upper); > @@ -824,14 +851,16 @@ 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 void put_buffer(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > uint8_t *v = pv; > qemu_put_buffer(f, v, size); > @@ -846,7 +875,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; > @@ -859,7 +889,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 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 +915,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; > @@ -898,7 +929,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 void put_bitmap(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > unsigned long *bmp = pv; > int i, idx = 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" > > -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 void 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)); > diff --git a/target-arm/machine.c b/target-arm/machine.c > index d90943b..96ff2da 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,7 +28,8 @@ 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 void put_fpscr(QEMUFile *f, void *opaque, size_t size, > + VMStateField *field, QJSON *vmdesc) > { > ARMCPU *cpu = opaque; > CPUARMState *env = &cpu->env; > @@ -163,7 +165,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 +183,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 void put_cpsr(QEMUFile *f, void *opaque, size_t size, > + VMStateField *field, QJSON *vmdesc) > { > ARMCPU *cpu = opaque; > CPUARMState *env = &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 = { > #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 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 = 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; > @@ -179,7 +181,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 void put_fpreg(QEMUFile *f, void *opaque, size_t size, > + VMStateField *field, QJSON *vmdesc) > { > FPReg *fp_reg = opaque; > uint64_t mant; > @@ -197,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; > @@ -214,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; > @@ -276,14 +281,16 @@ 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 void put_uint64_as_uint32(QEMUFile *f, void *pv, size_t size, > + VMStateField *field, QJSON *vmdesc) > { > uint64_t *v = 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) > > /* 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; > @@ -31,7 +31,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 void put_fpr(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > int i; > fpr_t *v = pv; > @@ -125,7 +126,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; > @@ -152,7 +153,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 void put_tlb(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > r4k_tlb_t *v = pv; > > 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 *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; > > @@ -116,7 +116,8 @@ 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 void put_avr(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > ppc_avr_t *v = pv; > > @@ -324,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; > > @@ -334,7 +335,8 @@ 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 void put_slbe(QEMUFile *f, void *pv, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > ppc_slb_t *v = pv; > > 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 = { > }; > #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; > @@ -72,7 +72,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 void put_psr(QEMUFile *f, void *opaque, size_t size, VMStateField *field, > + QJSON *vmdesc) > { > SPARCCPU *cpu = opaque; > CPUSPARCState *env = &cpu->env; > -- > 1.9.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index fa6fd0e..2a21150 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -987,7 +987,8 @@ static const VMStateDescription vmstate_virtio_gpu_scanouts = { }, }; -static void virtio_gpu_save(QEMUFile *f, void *opaque, size_t size) +static void virtio_gpu_save(QEMUFile *f, void *opaque, size_t size, + VMStateField *field, QJSON *vmdesc) { VirtIOGPU *g = opaque; struct virtio_gpu_simple_resource *res; @@ -1014,7 +1015,8 @@ static void virtio_gpu_save(QEMUFile *f, void *opaque, size_t size) vmstate_save_state(f, &vmstate_virtio_gpu_scanouts, g, NULL); } -static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size) +static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size, + VMStateField *field) { VirtIOGPU *g = opaque; struct virtio_gpu_simple_resource *res; diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c index 21ac2e2..a80a812 100644 --- a/hw/intc/s390_flic_kvm.c +++ b/hw/intc/s390_flic_kvm.c @@ -286,7 +286,8 @@ static void kvm_s390_release_adapter_routes(S390FLICState *fs, * increase until buffer is sufficient or maxium size is * reached */ -static void kvm_flic_save(QEMUFile *f, void *opaque, size_t size) +static void kvm_flic_save(QEMUFile *f, void *opaque, size_t size, + VMStateField *field, QJSON *vmdesc) { KVMS390FLICState *flic = opaque; int len = FLIC_SAVE_INITIAL_SIZE; @@ -331,7 +332,8 @@ static void kvm_flic_save(QEMUFile *f, void *opaque, size_t size) * Note: Do nothing when no interrupts where stored * in QEMUFile */ -static int kvm_flic_load(QEMUFile *f, void *opaque, size_t size) +static int kvm_flic_load(QEMUFile *f, void *opaque, size_t size, + VMStateField *field) { uint64_t len = 0; uint64_t count = 0; diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 90f6943..943a960 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -2450,7 +2450,8 @@ static void vmxnet3_put_tx_stats_to_file(QEMUFile *f, qemu_put_be64(f, tx_stat->pktsTxDiscard); } -static int vmxnet3_get_txq_descr(QEMUFile *f, void *pv, size_t size) +static int vmxnet3_get_txq_descr(QEMUFile *f, void *pv, size_t size, + VMStateField *field) { Vmxnet3TxqDescr *r = pv; @@ -2464,7 +2465,8 @@ static int vmxnet3_get_txq_descr(QEMUFile *f, void *pv, size_t size) return 0; } -static void vmxnet3_put_txq_descr(QEMUFile *f, void *pv, size_t size) +static void vmxnet3_put_txq_descr(QEMUFile *f, void *pv, size_t size, + VMStateField *field, QJSON *vmdesc) { Vmxnet3TxqDescr *r = pv; @@ -2511,7 +2513,8 @@ static void vmxnet3_put_rx_stats_to_file(QEMUFile *f, qemu_put_be64(f, rx_stat->pktsRxError); } -static int vmxnet3_get_rxq_descr(QEMUFile *f, void *pv, size_t size) +static int vmxnet3_get_rxq_descr(QEMUFile *f, void *pv, size_t size, + VMStateField *field) { Vmxnet3RxqDescr *r = pv; int i; @@ -2529,7 +2532,8 @@ static int vmxnet3_get_rxq_descr(QEMUFile *f, void *pv, size_t size) return 0; } -static void vmxnet3_put_rxq_descr(QEMUFile *f, void *pv, size_t size) +static void vmxnet3_put_rxq_descr(QEMUFile *f, void *pv, size_t size, + VMStateField *field, QJSON *vmdesc) { Vmxnet3RxqDescr *r = pv; int i; @@ -2574,7 +2578,8 @@ static const VMStateInfo rxq_descr_info = { .put = vmxnet3_put_rxq_descr }; -static int vmxnet3_get_int_state(QEMUFile *f, void *pv, size_t size) +static int vmxnet3_get_int_state(QEMUFile *f, void *pv, size_t size, + VMStateField *field) { Vmxnet3IntState *r = pv; @@ -2585,7 +2590,8 @@ static int vmxnet3_get_int_state(QEMUFile *f, void *pv, size_t size) return 0; } -static void vmxnet3_put_int_state(QEMUFile *f, void *pv, size_t size) +static void vmxnet3_put_int_state(QEMUFile *f, void *pv, size_t size, + VMStateField *field, QJSON *vmdesc) { Vmxnet3IntState *r = pv; diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c index 2c16fc2..76d5f41 100644 --- a/hw/nvram/eeprom93xx.c +++ b/hw/nvram/eeprom93xx.c @@ -94,14 +94,16 @@ struct _eeprom_t { This is a Big hack, but it is how the old state did it. */ -static int get_uint16_from_uint8(QEMUFile *f, void *pv, size_t size) +static int get_uint16_from_uint8(QEMUFile *f, void *pv, size_t size, + VMStateField *field) { uint16_t *v = pv; *v = qemu_get_ubyte(f); return 0; } -static void put_unused(QEMUFile *f, void *pv, size_t size) +static void put_unused(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { fprintf(stderr, "uint16_from_uint8 is used only for backwards compatibility.\n"); fprintf(stderr, "Never should be used to write a new state.\n"); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 92aa563..a8a4a7a 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -524,14 +524,16 @@ static void fw_cfg_reset(DeviceState *d) Or we broke compatibility in the state, or we can't use struct tm */ -static int get_uint32_as_uint16(QEMUFile *f, void *pv, size_t size) +static int get_uint32_as_uint16(QEMUFile *f, void *pv, size_t size, + VMStateField *field) { uint32_t *v = pv; *v = qemu_get_be16(f); return 0; } -static void put_unused(QEMUFile *f, void *pv, size_t size) +static void put_unused(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { fprintf(stderr, "uint32_as_uint16 is only used for backward compatibility.\n"); fprintf(stderr, "This functions shouldn't be called.\n"); diff --git a/hw/pci/msix.c b/hw/pci/msix.c index 0ec1cb1..69e7a50 100644 --- a/hw/pci/msix.c +++ b/hw/pci/msix.c @@ -587,12 +587,14 @@ void msix_unset_vector_notifiers(PCIDevice *dev) dev->msix_vector_poll_notifier = NULL; } -static void put_msix_state(QEMUFile *f, void *pv, size_t size) +static void put_msix_state(QEMUFile *f, void *pv, size_t size, + VMStateField *field, QJSON *vmdesc) { msix_save(pv, f); } -static int get_msix_state(QEMUFile *f, void *pv, size_t size) +static int get_msix_state(QEMUFile *f, void *pv, size_t size, + VMStateField *field) { msix_load(pv, f); return 0; diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 24fae16..08c4547 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -445,7 +445,8 @@ int pci_bus_numa_node(PCIBus *bus) return PCI_BUS_GET_CLASS(bus)->numa_node(bus); } -static int get_pci_config_device(QEMUFile *f, void *pv, size_t size) +static int get_pci_config_device(QEMUFile *f, void *pv, size_t size, + VMStateField *field) { PCIDevice *s = container_of(pv, PCIDevice, config); PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(s); @@ -484,7 +485,8 @@ static int get_pci_config_device(QEMUFile *f, void *pv, size_t size) } /* just put buffer */ -static void put_pci_config_device(QEMUFile *f, void *pv, size_t size) +static void put_pci_config_device(QEMUFile *f, void *pv, size_t size, + VMStateField *field, QJSON *vmdesc) { const uint8_t **v = pv; assert(size == pci_config_size(container_of(pv, PCIDevice, config))); @@ -497,7 +499,8 @@ static VMStateInfo vmstate_info_pci_config = { .put = put_pci_config_device, }; -static int get_pci_irq_state(QEMUFile *f, void *pv, size_t size) +static int get_pci_irq_state(QEMUFile *f, void *pv, size_t size, + VMStateField *field) { PCIDevice *s = container_of(pv, PCIDevice, irq_state); uint32_t irq_state[PCI_NUM_PINS]; @@ -518,7 +521,8 @@ static int get_pci_irq_state(QEMUFile *f, void *pv, size_t size) return 0; } -static void put_pci_irq_state(QEMUFile *f, void *pv, size_t size) +static void put_pci_irq_state(QEMUFile *f, void *pv, size_t size, + VMStateField *field, QJSON *vmdesc) { int i; PCIDevice *s = container_of(pv, PCIDevice, irq_state); diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c index 3dcd472..9f82aa6 100644 --- a/hw/pci/shpc.c +++ b/hw/pci/shpc.c @@ -695,13 +695,14 @@ void shpc_cap_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) shpc_cap_update_dword(d); } -static void shpc_save(QEMUFile *f, void *pv, size_t size) +static void shpc_save(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { PCIDevice *d = container_of(pv, PCIDevice, shpc); qemu_put_buffer(f, d->shpc->config, SHPC_SIZEOF(d)); } -static int shpc_load(QEMUFile *f, void *pv, size_t size) +static int shpc_load(QEMUFile *f, void *pv, size_t size, VMStateField *field) { PCIDevice *d = container_of(pv, PCIDevice, shpc); int ret = qemu_get_buffer(f, d->shpc->config, SHPC_SIZEOF(d)); diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 297216d..f40c10b 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1945,7 +1945,8 @@ SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int id, int lun) /* SCSI request list. For simplicity, pv points to the whole device */ -static void put_scsi_requests(QEMUFile *f, void *pv, size_t size) +static void put_scsi_requests(QEMUFile *f, void *pv, size_t size, + VMStateField *field, QJSON *vmdesc) { SCSIDevice *s = pv; SCSIBus *bus = DO_UPCAST(SCSIBus, qbus, s->qdev.parent_bus); @@ -1970,7 +1971,8 @@ static void put_scsi_requests(QEMUFile *f, void *pv, size_t size) qemu_put_sbyte(f, 0); } -static int get_scsi_requests(QEMUFile *f, void *pv, size_t size) +static int get_scsi_requests(QEMUFile *f, void *pv, size_t size, + VMStateField *field) { SCSIDevice *s = pv; SCSIBus *bus = DO_UPCAST(SCSIBus, qbus, s->qdev.parent_bus); diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c index 7ba4e9a..95eb7f3 100644 --- a/hw/timer/twl92230.c +++ b/hw/timer/twl92230.c @@ -747,14 +747,16 @@ static int menelaus_rx(I2CSlave *i2c) Or we broke compatibility in the state, or we can't use struct tm */ -static int get_int32_as_uint16(QEMUFile *f, void *pv, size_t size) +static int get_int32_as_uint16(QEMUFile *f, void *pv, size_t size, + VMStateField *field) { int *v = pv; *v = qemu_get_be16(f); return 0; } -static void put_int32_as_uint16(QEMUFile *f, void *pv, size_t size) +static void put_int32_as_uint16(QEMUFile *f, void *pv, size_t size, + VMStateField *field, QJSON *vmdesc) { int *v = pv; qemu_put_be16(f, *v); diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index d4ca026..7f28c3e 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -2158,7 +2158,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 void usbredir_put_parser(QEMUFile *f, void *priv, size_t unused, + VMStateField *field, QJSON *vmdesc) { USBRedirDevice *dev = priv; uint8_t *data; @@ -2178,7 +2179,8 @@ static void usbredir_put_parser(QEMUFile *f, void *priv, size_t unused) free(data); } -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; @@ -2221,7 +2223,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 void usbredir_put_bufpq(QEMUFile *f, void *priv, size_t unused, + VMStateField *field, QJSON *vmdesc) { struct endp_data *endp = priv; USBRedirDevice *dev = endp->dev; @@ -2241,7 +2244,8 @@ static void usbredir_put_bufpq(QEMUFile *f, void *priv, size_t unused) assert(i == endp->bufpq_size); } -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; @@ -2344,7 +2348,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 void usbredir_put_packet_id_q(QEMUFile *f, void *priv, size_t unused, + VMStateField *field, QJSON *vmdesc) { struct PacketIdQueue *q = priv; USBRedirDevice *dev = q->dev; @@ -2360,7 +2365,8 @@ static void usbredir_put_packet_id_q(QEMUFile *f, void *priv, size_t unused) assert(remain == 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 06831de..4bd12f0 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 void put_virtio_pci_modern_state(QEMUFile *f, void *pv, size_t size, + VMStateField *field, QJSON *vmdesc) { VirtIOPCIProxy *proxy = pv; int i; diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index d48d1a9..c799c5c 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -1490,7 +1490,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)); @@ -1503,7 +1504,8 @@ 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 void 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)); @@ -1640,13 +1642,15 @@ 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 void virtio_device_put(QEMUFile *f, void *opaque, size_t size, + VMStateField *field, QJSON *vmdesc) { virtio_save(VIRTIO_DEVICE(opaque), f); } /* 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..d0e37b5 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -81,11 +81,18 @@ 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 can be passed + * into get and put in terms of field and vmdesc parameters. + * 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); + void (*put)(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc); }; enum VMStateFlags { @@ -186,7 +193,7 @@ enum VMStateFlags { VMS_MULTIPLY_ELEMENTS = 0x4000, }; -typedef struct { +struct VMStateField { const char *name; size_t offset; size_t size; @@ -199,7 +206,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 33a2911..12b7f8d 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 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 void put_timer(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { QEMUTimer *v = pv; timer_put(f, v); diff --git a/migration/vmstate.c b/migration/vmstate.c index fc29acf..d188afa 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); @@ -83,6 +84,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, trace_vmstate_load_state(vmsd->name, version_id); if (version_id > vmsd->version_id) { + error_report("%s %s", vmsd->name, "too new"); trace_vmstate_load_state_end(vmsd->name, "too new", -EINVAL); return -EINVAL; } @@ -93,6 +95,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, trace_vmstate_load_state_end(vmsd->name, "old path", ret); return ret; } + error_report("%s %s", vmsd->name, "too old"); trace_vmstate_load_state_end(vmsd->name, "too old", -EINVAL); return -EINVAL; } @@ -122,8 +125,10 @@ 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); - + /* field is always passed in. But it should be ignored by + * get when not needed. It is only needed in cases* of + * customized handling, such as migrating QTAILQ. */ + ret = field->info->get(f, addr, size, field); } if (ret >= 0) { ret = qemu_file_get_error(f); @@ -328,7 +333,11 @@ 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 and vmdesc_loop are always passed in. But they + * should be ignored by put when not needed. They are + * only needed in cases f customized handling, such as + * migrating QTAILQ. */ + field->info->put(f, addr, size, field, vmdesc_loop); } written_bytes = qemu_ftell_fast(f) - old_offset; @@ -461,14 +470,15 @@ 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 void put_bool(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { bool *v = pv; qemu_put_byte(f, *v); @@ -482,14 +492,15 @@ 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 void put_int8(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { int8_t *v = pv; qemu_put_s8s(f, v); @@ -503,14 +514,15 @@ 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 void put_int16(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { int16_t *v = pv; qemu_put_sbe16s(f, v); @@ -524,14 +536,15 @@ 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 void put_int32(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { int32_t *v = pv; qemu_put_sbe32s(f, v); @@ -546,7 +559,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; @@ -568,7 +582,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; @@ -589,14 +603,15 @@ 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 void put_int64(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { int64_t *v = pv; qemu_put_sbe64s(f, v); @@ -610,14 +625,15 @@ 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 void put_uint8(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { uint8_t *v = pv; qemu_put_8s(f, v); @@ -631,14 +647,15 @@ 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 void put_uint16(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { uint16_t *v = pv; qemu_put_be16s(f, v); @@ -652,14 +669,15 @@ 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 void put_uint32(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { uint32_t *v = pv; qemu_put_be32s(f, v); @@ -674,7 +692,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; @@ -694,14 +713,15 @@ 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 void put_uint64(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { uint64_t *v = pv; qemu_put_be64s(f, v); @@ -716,7 +736,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; @@ -737,7 +758,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; @@ -758,7 +780,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; @@ -778,7 +801,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; @@ -786,7 +810,8 @@ 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 void put_float64(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { uint64_t *v = pv; @@ -801,7 +826,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); @@ -809,7 +835,8 @@ 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 void put_cpudouble(QEMUFile *f, void *pv, size_t size, + VMStateField *field, QJSON *vmdesc) { CPU_DoubleU *v = pv; qemu_put_be32s(f, &v->l.upper); @@ -824,14 +851,16 @@ 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 void put_buffer(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { uint8_t *v = pv; qemu_put_buffer(f, v, size); @@ -846,7 +875,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; @@ -859,7 +889,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 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 +915,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; @@ -898,7 +929,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 void put_bitmap(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { unsigned long *bmp = pv; int i, idx = 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" -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 void 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)); diff --git a/target-arm/machine.c b/target-arm/machine.c index d90943b..96ff2da 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,7 +28,8 @@ 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 void put_fpscr(QEMUFile *f, void *opaque, size_t size, + VMStateField *field, QJSON *vmdesc) { ARMCPU *cpu = opaque; CPUARMState *env = &cpu->env; @@ -163,7 +165,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 +183,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 void put_cpsr(QEMUFile *f, void *opaque, size_t size, + VMStateField *field, QJSON *vmdesc) { ARMCPU *cpu = opaque; CPUARMState *env = &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 = { #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 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 = 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; @@ -179,7 +181,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 void put_fpreg(QEMUFile *f, void *opaque, size_t size, + VMStateField *field, QJSON *vmdesc) { FPReg *fp_reg = opaque; uint64_t mant; @@ -197,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; @@ -214,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; @@ -276,14 +281,16 @@ 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 void put_uint64_as_uint32(QEMUFile *f, void *pv, size_t size, + VMStateField *field, QJSON *vmdesc) { uint64_t *v = 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) /* 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; @@ -31,7 +31,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 void put_fpr(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { int i; fpr_t *v = pv; @@ -125,7 +126,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; @@ -152,7 +153,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 void put_tlb(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { r4k_tlb_t *v = pv; 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 *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; @@ -116,7 +116,8 @@ 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 void put_avr(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { ppc_avr_t *v = pv; @@ -324,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; @@ -334,7 +335,8 @@ 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 void put_slbe(QEMUFile *f, void *pv, size_t size, VMStateField *field, + QJSON *vmdesc) { ppc_slb_t *v = pv; 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 = { }; #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; @@ -72,7 +72,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 void put_psr(QEMUFile *f, void *opaque, size_t size, VMStateField *field, + QJSON *vmdesc) { SPARCCPU *cpu = opaque; CPUSPARCState *env = &cpu->env;
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 <duanj@linux.vnet.ibm.com> --- hw/display/virtio-gpu.c | 6 ++- hw/intc/s390_flic_kvm.c | 6 ++- 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 | 12 +++-- include/migration/vmstate.h | 15 +++++-- migration/savevm.c | 5 ++- migration/vmstate.c | 106 ++++++++++++++++++++++++++++---------------- 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 ++- 22 files changed, 198 insertions(+), 104 deletions(-)