* [Qemu-devel] [QEMU PATCH v13 0/4] migration: migrate QTAILQ
@ 2016-11-17 0:07 Jianjun Duan
2016-11-17 0:07 ` [Qemu-devel] [QEMU PATCH v13 1/4] migration: extend VMStateInfo Jianjun Duan
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Jianjun Duan @ 2016-11-17 0:07 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-ppc, duanj, dmitry, peter.maydell, kraxel, mst, david,
pbonzini, veroniabahaa, quintela, amit.shah, mreitz, kwolf, rth,
aurelien, leon.alrae, blauwirbel, mark.cave-ayland, mdroth,
dgilbert
Hi all,
I addressed some review comments. Comments are welcome.
v13: - Changed some QTAILQ related macro names to match existing ones.
Previous versions are:
v12: - Fixed type for put_qtailq which caused build break.
(link: http://lists.gnu.org/archive/html/qemu-devel/2016-11/msg01328.html
v11: - Split error_report statements into a separate patch.
- Changed the signature of put. It now returns int type.
- Minor changes to QTAILQ macros.
v10: - Fixed a typo.
(link: http://lists.nongnu.org/archive/html/qemu-ppc/2016-10/msg01206.html)
v9: - No more hard encoding of QTAILQ layout information
(link: http://lists.nongnu.org/archive/html/qemu-ppc/2016-10/msg01042.html)
v8: - Fixed a style issue.
(link: http://lists.nongnu.org/archive/html/qemu-ppc/2016-10/msg00874.html)
v7: - Fixed merge errors.
- Simplified macro definitions related to pointer arithmetic based QTAILQ access.
- Added test case for QTAILQ migration in tests/test-vmstate.c.
(link: http://lists.nongnu.org/archive/html/qemu-ppc/2016-10/msg00711.html)
v6: - Split from Power specific patches.
- Dropped VMS_LINKED flag.
- Rebased to master.
- Added comments to clarify about put/get in VMStateInfo.
(link: http://lists.nongnu.org/archive/html/qemu-ppc/2016-10/msg00336.html)
v5: - Rebased to David's ppc-for-2.8.
(link: https://lists.nongnu.org/archive/html/qemu-devel/2016-10/msg00270.html)
v4: - Introduce a way to set customized instance_id in SaveStateEntry. Use it
to set instance_id for DRC using its unique index to address David
Gibson's concern.
- Rename VMS_CSTM to VMS_LINKED based on Paolo Bonzini's suggestions.
- Clean up qjson stuff in put_qtailq.
- Add trace for put_qtailq and get_qtailq based on David Gilbert's
suggestion.
- Based on David's ppc-for-2.7.
(link: https://lists.nongnu.org/archive/html/qemu-devel/2016-06/msg07720.html)
v3: - Simplify overall design followng discussion with Paolo. No longer need
metadata to migrate QTAILQ.
- Extend VMStateInfo instead of adding similar fields to VMStateField.
- Clean up macros in qemu/queue.h.
(link: https://lists.nongnu.org/archive/html/qemu-devel/2016-05/msg05695.html)
v2: - Introduce a general approach to migrate QTAILQ in qemu/queue.h.
- Migrate signalled field in the DRC state.
- Put the newly added migrating fields in subsections so that backward
migration is not broken.
- Set detach_cb field right after migration so that a migrated hot-unplug
event could finish its course.
(link: https://lists.nongnu.org/archive/html/qemu-devel/2016-05/msg04188.html)
v1: - Inital version.
(link: https://lists.nongnu.org/archive/html/qemu-devel/2016-04/msg02601.html)
Jianjun Duan (4):
migration: extend VMStateInfo
migration: migrate QTAILQ
tests/migration: Add test for QTAILQ migration
migration: add error_report
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 | 39 ++++++++--
include/qemu/queue.h | 60 +++++++++++++++
migration/savevm.c | 7 +-
migration/trace-events | 4 +
migration/vmstate.c | 184 +++++++++++++++++++++++++++++++++++---------
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 +-
tests/test-vmstate.c | 160 ++++++++++++++++++++++++++++++++++++++
25 files changed, 577 insertions(+), 105 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [Qemu-devel] [QEMU PATCH v13 1/4] migration: extend VMStateInfo 2016-11-17 0:07 [Qemu-devel] [QEMU PATCH v13 0/4] migration: migrate QTAILQ Jianjun Duan @ 2016-11-17 0:07 ` Jianjun Duan 2016-11-23 16:29 ` Dr. David Alan Gilbert 2016-11-17 0:07 ` [Qemu-devel] [QEMU PATCH v13 2/4] migration: migrate QTAILQ Jianjun Duan ` (3 subsequent siblings) 4 siblings, 1 reply; 7+ messages in thread From: Jianjun Duan @ 2016-11-17 0:07 UTC (permalink / raw) To: qemu-devel Cc: qemu-ppc, duanj, dmitry, peter.maydell, kraxel, mst, david, pbonzini, veroniabahaa, quintela, amit.shah, mreitz, kwolf, rth, aurelien, leon.alrae, blauwirbel, mark.cave-ayland, mdroth, dgilbert 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 <duanj@linux.vnet.ibm.com> --- 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(-) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 60bce94..c58fa1b 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -988,7 +988,8 @@ static const VMStateDescription vmstate_virtio_gpu_scanouts = { }, }; -static void virtio_gpu_save(QEMUFile *f, void *opaque, size_t size) +static int virtio_gpu_save(QEMUFile *f, void *opaque, size_t size, + VMStateField *field, QJSON *vmdesc) { VirtIOGPU *g = opaque; struct virtio_gpu_simple_resource *res; @@ -1013,9 +1014,12 @@ static void virtio_gpu_save(QEMUFile *f, void *opaque, size_t size) qemu_put_be32(f, 0); /* end of list */ vmstate_save_state(f, &vmstate_virtio_gpu_scanouts, g, NULL); + + return 0; } -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..61f512f 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 int kvm_flic_save(QEMUFile *f, void *opaque, size_t size, + VMStateField *field, QJSON *vmdesc) { KVMS390FLICState *flic = opaque; int len = FLIC_SAVE_INITIAL_SIZE; @@ -319,6 +320,8 @@ static void kvm_flic_save(QEMUFile *f, void *opaque, size_t size) count * sizeof(struct kvm_s390_irq)); } g_free(buf); + + return 0; } /** @@ -331,7 +334,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 92f6af9..4163ca8 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -2451,7 +2451,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; @@ -2465,7 +2466,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 int vmxnet3_put_txq_descr(QEMUFile *f, void *pv, size_t size, + VMStateField *field, QJSON *vmdesc) { Vmxnet3TxqDescr *r = pv; @@ -2474,6 +2476,8 @@ static void vmxnet3_put_txq_descr(QEMUFile *f, void *pv, size_t size) qemu_put_byte(f, r->intr_idx); qemu_put_be64(f, r->tx_stats_pa); vmxnet3_put_tx_stats_to_file(f, &r->txq_stats); + + return 0; } static const VMStateInfo txq_descr_info = { @@ -2512,7 +2516,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; @@ -2530,7 +2535,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 int vmxnet3_put_rxq_descr(QEMUFile *f, void *pv, size_t size, + VMStateField *field, QJSON *vmdesc) { Vmxnet3RxqDescr *r = pv; int i; @@ -2543,6 +2549,8 @@ static void vmxnet3_put_rxq_descr(QEMUFile *f, void *pv, size_t size) qemu_put_byte(f, r->intr_idx); qemu_put_be64(f, r->rx_stats_pa); vmxnet3_put_rx_stats_to_file(f, &r->rxq_stats); + + return 0; } static int vmxnet3_post_load(void *opaque, int version_id) @@ -2575,7 +2583,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; @@ -2586,13 +2595,16 @@ 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 int vmxnet3_put_int_state(QEMUFile *f, void *pv, size_t size, + VMStateField *field, QJSON *vmdesc) { Vmxnet3IntState *r = pv; qemu_put_byte(f, r->is_masked); qemu_put_byte(f, r->is_pending); qemu_put_byte(f, r->is_asserted); + + return 0; } static const VMStateInfo int_state_info = { diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c index 2c16fc2..848692a 100644 --- a/hw/nvram/eeprom93xx.c +++ b/hw/nvram/eeprom93xx.c @@ -94,18 +94,22 @@ 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 int 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"); exit(0); + + return 0; } static const VMStateInfo vmstate_hack_uint16_from_uint8 = { diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 1f0c3e9..8990cde 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -523,17 +523,21 @@ 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 int 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"); + + return 0; } static const VMStateInfo vmstate_hack_uint32_as_uint16 = { diff --git a/hw/pci/msix.c b/hw/pci/msix.c index 0ec1cb1..ee1714d 100644 --- a/hw/pci/msix.c +++ b/hw/pci/msix.c @@ -587,12 +587,16 @@ 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 int put_msix_state(QEMUFile *f, void *pv, size_t size, + VMStateField *field, QJSON *vmdesc) { msix_save(pv, f); + + return 0; } -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..16df188 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,11 +485,14 @@ 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 int 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))); qemu_put_buffer(f, *v, size); + + return 0; } static VMStateInfo vmstate_info_pci_config = { @@ -497,7 +501,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 +523,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 int 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); @@ -526,6 +532,8 @@ static void put_pci_irq_state(QEMUFile *f, void *pv, size_t size) for (i = 0; i < PCI_NUM_PINS; ++i) { qemu_put_be32(f, pci_irq_state(s, i)); } + + return 0; } static VMStateInfo vmstate_info_pci_irq_state = { diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c index 3dcd472..42fafac 100644 --- a/hw/pci/shpc.c +++ b/hw/pci/shpc.c @@ -695,13 +695,16 @@ 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 int 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)); + + return 0; } -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..5940cb1 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 int 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); @@ -1968,9 +1969,12 @@ static void put_scsi_requests(QEMUFile *f, void *pv, size_t size) } } qemu_put_sbyte(f, 0); + + return 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..c172eac 100644 --- a/hw/timer/twl92230.c +++ b/hw/timer/twl92230.c @@ -747,17 +747,21 @@ 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 int put_int32_as_uint16(QEMUFile *f, void *pv, size_t size, + VMStateField *field, QJSON *vmdesc) { int *v = pv; qemu_put_be16(f, *v); + + return 0; } static const VMStateInfo vmstate_hack_int32_as_uint16 = { 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; } -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 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [QEMU PATCH v13 1/4] migration: extend VMStateInfo 2016-11-17 0:07 ` [Qemu-devel] [QEMU PATCH v13 1/4] migration: extend VMStateInfo Jianjun Duan @ 2016-11-23 16:29 ` Dr. David Alan Gilbert 0 siblings, 0 replies; 7+ messages in thread From: Dr. David Alan Gilbert @ 2016-11-23 16:29 UTC (permalink / raw) To: Jianjun Duan Cc: qemu-devel, qemu-ppc, dmitry, peter.maydell, kraxel, mst, david, pbonzini, veroniabahaa, quintela, amit.shah, mreitz, kwolf, rth, aurelien, leon.alrae, blauwirbel, mark.cave-ayland, mdroth * 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. put now > will return int type. > > Signed-off-by: Jianjun Duan <duanj@linux.vnet.ibm.com> > --- > 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. 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 / dgilbert@redhat.com / Manchester, UK ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [QEMU PATCH v13 2/4] migration: migrate QTAILQ 2016-11-17 0:07 [Qemu-devel] [QEMU PATCH v13 0/4] migration: migrate QTAILQ Jianjun Duan 2016-11-17 0:07 ` [Qemu-devel] [QEMU PATCH v13 1/4] migration: extend VMStateInfo Jianjun Duan @ 2016-11-17 0:07 ` Jianjun Duan 2016-11-17 0:07 ` [Qemu-devel] [QEMU PATCH v13 3/4] tests/migration: Add test for QTAILQ migration Jianjun Duan ` (2 subsequent siblings) 4 siblings, 0 replies; 7+ messages in thread From: Jianjun Duan @ 2016-11-17 0:07 UTC (permalink / raw) To: qemu-devel Cc: qemu-ppc, duanj, dmitry, peter.maydell, kraxel, mst, david, pbonzini, veroniabahaa, quintela, amit.shah, mreitz, kwolf, rth, aurelien, leon.alrae, blauwirbel, mark.cave-ayland, mdroth, dgilbert Currently we cannot directly transfer a QTAILQ instance because of the limitation in the migration code. Here we introduce an approach to transfer such structures. We created VMStateInfo vmstate_info_qtailq for QTAILQ. Similar VMStateInfo can be created for other data structures such as list. When a QTAILQ is migrated from source to target, it is appended to the corresponding QTAILQ structure, which is assumed to have been properly initialized. This approach will be used to transfer pending_events and ccs_list in spapr state. We also create some macros in qemu/queue.h to access a QTAILQ using pointer arithmetic. This ensures that we do not depend on the implementation details about QTAILQ in the migration code. Signed-off-by: Jianjun Duan <duanj@linux.vnet.ibm.com> --- include/migration/vmstate.h | 20 +++++++++++++ include/qemu/queue.h | 60 +++++++++++++++++++++++++++++++++++++++ migration/trace-events | 4 +++ migration/vmstate.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 153 insertions(+) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index eafc8f2..e47ad6e 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -253,6 +253,7 @@ extern const VMStateInfo vmstate_info_timer; extern const VMStateInfo vmstate_info_buffer; extern const VMStateInfo vmstate_info_unused_buffer; extern const VMStateInfo vmstate_info_bitmap; +extern const VMStateInfo vmstate_info_qtailq; #define type_check_2darray(t1,t2,n,m) ((t1(*)[n][m])0 - (t2*)0) #define type_check_array(t1,t2,n) ((t1(*)[n])0 - (t2*)0) @@ -664,6 +665,25 @@ extern const VMStateInfo vmstate_info_bitmap; .offset = offsetof(_state, _field), \ } +/* For migrating a QTAILQ. + * Target QTAILQ needs be properly initialized. + * _type: type of QTAILQ element + * _next: name of QTAILQ entry field in QTAILQ element + * _vmsd: VMSD for QTAILQ element + * size: size of QTAILQ element + * start: offset of QTAILQ entry in QTAILQ element + */ +#define VMSTATE_QTAILQ_V(_field, _state, _version, _vmsd, _type, _next) \ +{ \ + .name = (stringify(_field)), \ + .version_id = (_version), \ + .vmsd = &(_vmsd), \ + .size = sizeof(_type), \ + .info = &vmstate_info_qtailq, \ + .offset = offsetof(_state, _field), \ + .start = offsetof(_type, _next), \ +} + /* _f : field name _f_n : num of elements field_name _n : num of elements diff --git a/include/qemu/queue.h b/include/qemu/queue.h index 342073f..35292c3 100644 --- a/include/qemu/queue.h +++ b/include/qemu/queue.h @@ -438,4 +438,64 @@ struct { \ #define QTAILQ_PREV(elm, headname, field) \ (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last)) +#define field_at_offset(base, offset, type) \ + ((type) (((char *) (base)) + (offset))) + +typedef struct DUMMY_Q_ENTRY DUMMY_Q_ENTRY; +typedef struct DUMMY_Q DUMMY_Q; + +struct DUMMY_Q_ENTRY { + QTAILQ_ENTRY(DUMMY_Q_ENTRY) next; +}; + +struct DUMMY_Q { + QTAILQ_HEAD(DUMMY_Q_HEAD, DUMMY_Q_ENTRY) head; +}; + +#define dummy_q ((DUMMY_Q *) 0) +#define dummy_qe ((DUMMY_Q_ENTRY *) 0) + +/* + * Offsets of layout of a tail queue head. + */ +#define QTAILQ_FIRST_OFFSET (offsetof(typeof(dummy_q->head), tqh_first)) +#define QTAILQ_LAST_OFFSET (offsetof(typeof(dummy_q->head), tqh_last)) +/* + * Raw access of elements of a tail queue + */ +#define QTAILQ_RAW_FIRST(head) \ + (*field_at_offset(head, QTAILQ_FIRST_OFFSET, void **)) +#define QTAILQ_RAW_TQH_LAST(head) \ + (*field_at_offset(head, QTAILQ_LAST_OFFSET, void ***)) + +/* + * Offsets of layout of a tail queue element. + */ +#define QTAILQ_NEXT_OFFSET (offsetof(typeof(dummy_qe->next), tqe_next)) +#define QTAILQ_PREV_OFFSET (offsetof(typeof(dummy_qe->next), tqe_prev)) + +/* + * Raw access of elements of a tail entry + */ +#define QTAILQ_RAW_NEXT(elm, entry) \ + (*field_at_offset(elm, entry + QTAILQ_NEXT_OFFSET, void **)) +#define QTAILQ_RAW_TQE_PREV(elm, entry) \ + (*field_at_offset(elm, entry + QTAILQ_PREV_OFFSET, void ***)) +/* + * Tail queue tranversal using pointer arithmetic. + */ +#define QTAILQ_RAW_FOREACH(elm, head, entry) \ + for ((elm) = QTAILQ_RAW_FIRST(head); \ + (elm); \ + (elm) = QTAILQ_RAW_NEXT(elm, entry)) +/* + * Tail queue insertion using pointer arithmetic. + */ +#define QTAILQ_RAW_INSERT_TAIL(head, elm, entry) do { \ + QTAILQ_RAW_NEXT(elm, entry) = NULL; \ + QTAILQ_RAW_TQE_PREV(elm, entry) = QTAILQ_RAW_TQH_LAST(head); \ + *QTAILQ_RAW_TQH_LAST(head) = (elm); \ + QTAILQ_RAW_TQH_LAST(head) = &QTAILQ_RAW_NEXT(elm, entry); \ +} while (/*CONSTCOND*/0) + #endif /* QEMU_SYS_QUEUE_H */ diff --git a/migration/trace-events b/migration/trace-events index 94134f7..c46f9e9 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -52,6 +52,10 @@ vmstate_n_elems(const char *name, int n_elems) "%s: %d" vmstate_subsection_load(const char *parent) "%s" vmstate_subsection_load_bad(const char *parent, const char *sub, const char *sub2) "%s: %s/%s" vmstate_subsection_load_good(const char *parent) "%s" +get_qtailq(const char *name, int version_id) "%s v%d" +get_qtailq_end(const char *name, const char *reason, int val) "%s %s/%d" +put_qtailq(const char *name, int version_id) "%s v%d" +put_qtailq_end(const char *name, const char *reason) "%s %s" # migration/qemu-file.c qemu_file_fclose(void) "" diff --git a/migration/vmstate.c b/migration/vmstate.c index 7b4bd6e..2f9d4ba 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -5,6 +5,7 @@ #include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/error-report.h" +#include "qemu/queue.h" #include "trace.h" #include "migration/qjson.h" @@ -965,3 +966,71 @@ const VMStateInfo vmstate_info_bitmap = { .get = get_bitmap, .put = put_bitmap, }; + +/* get for QTAILQ + * meta data about the QTAILQ is encoded in a VMStateField structure + */ +static int get_qtailq(QEMUFile *f, void *pv, size_t unused_size, + VMStateField *field) +{ + int ret = 0; + const VMStateDescription *vmsd = field->vmsd; + /* size of a QTAILQ element */ + size_t size = field->size; + /* offset of the QTAILQ entry in a QTAILQ element */ + size_t entry_offset = field->start; + int version_id = field->version_id; + void *elm; + + trace_get_qtailq(vmsd->name, version_id); + if (version_id > vmsd->version_id) { + error_report("%s %s", vmsd->name, "too new"); + trace_get_qtailq_end(vmsd->name, "too new", -EINVAL); + + return -EINVAL; + } + if (version_id < vmsd->minimum_version_id) { + error_report("%s %s", vmsd->name, "too old"); + trace_get_qtailq_end(vmsd->name, "too old", -EINVAL); + return -EINVAL; + } + + while (qemu_get_byte(f)) { + elm = g_malloc(size); + ret = vmstate_load_state(f, vmsd, elm, version_id); + if (ret) { + return ret; + } + QTAILQ_RAW_INSERT_TAIL(pv, elm, entry_offset); + } + + trace_get_qtailq_end(vmsd->name, "end", ret); + return ret; +} + +/* put for QTAILQ */ +static int put_qtailq(QEMUFile *f, void *pv, size_t unused_size, + VMStateField *field, QJSON *vmdesc) +{ + const VMStateDescription *vmsd = field->vmsd; + /* offset of the QTAILQ entry in a QTAILQ element*/ + size_t entry_offset = field->start; + void *elm; + + trace_put_qtailq(vmsd->name, vmsd->version_id); + + QTAILQ_RAW_FOREACH(elm, pv, entry_offset) { + qemu_put_byte(f, true); + vmstate_save_state(f, vmsd, elm, vmdesc); + } + qemu_put_byte(f, false); + + trace_put_qtailq_end(vmsd->name, "end"); + + return 0; +} +const VMStateInfo vmstate_info_qtailq = { + .name = "qtailq", + .get = get_qtailq, + .put = put_qtailq, +}; -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [QEMU PATCH v13 3/4] tests/migration: Add test for QTAILQ migration 2016-11-17 0:07 [Qemu-devel] [QEMU PATCH v13 0/4] migration: migrate QTAILQ Jianjun Duan 2016-11-17 0:07 ` [Qemu-devel] [QEMU PATCH v13 1/4] migration: extend VMStateInfo Jianjun Duan 2016-11-17 0:07 ` [Qemu-devel] [QEMU PATCH v13 2/4] migration: migrate QTAILQ Jianjun Duan @ 2016-11-17 0:07 ` Jianjun Duan 2016-11-17 0:07 ` [Qemu-devel] [QEMU PATCH v13 4/4] migration: add error_report Jianjun Duan 2016-11-18 17:22 ` [Qemu-devel] [QEMU PATCH v13 0/4] migration: migrate QTAILQ Jianjun Duan 4 siblings, 0 replies; 7+ messages in thread From: Jianjun Duan @ 2016-11-17 0:07 UTC (permalink / raw) To: qemu-devel Cc: qemu-ppc, duanj, dmitry, peter.maydell, kraxel, mst, david, pbonzini, veroniabahaa, quintela, amit.shah, mreitz, kwolf, rth, aurelien, leon.alrae, blauwirbel, mark.cave-ayland, mdroth, dgilbert Add a test for QTAILQ migration to tests/test-vmstate.c. Signed-off-by: Jianjun Duan <duanj@linux.vnet.ibm.com> --- tests/test-vmstate.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index d2f529b..88aab8c 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -544,6 +544,163 @@ static void test_arr_ptr_str_no0_load(void) } } +/* test QTAILQ migration */ +typedef struct TestQtailqElement TestQtailqElement; + +struct TestQtailqElement { + bool b; + uint8_t u8; + QTAILQ_ENTRY(TestQtailqElement) next; +}; + +typedef struct TestQtailq { + int16_t i16; + QTAILQ_HEAD(TestQtailqHead, TestQtailqElement) q; + int32_t i32; +} TestQtailq; + +static const VMStateDescription vmstate_q_element = { + .name = "test/queue-element", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_BOOL(b, TestQtailqElement), + VMSTATE_UINT8(u8, TestQtailqElement), + VMSTATE_END_OF_LIST() + }, +}; + +static const VMStateDescription vmstate_q = { + .name = "test/queue", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_INT16(i16, TestQtailq), + VMSTATE_QTAILQ_V(q, TestQtailq, 1, vmstate_q_element, TestQtailqElement, + next), + VMSTATE_INT32(i32, TestQtailq), + VMSTATE_END_OF_LIST() + } +}; + +static void test_save_q(void) +{ + TestQtailq obj_q = { + .i16 = -512, + .i32 = 70000, + }; + + TestQtailqElement obj_qe1 = { + .b = true, + .u8 = 130, + }; + + TestQtailqElement obj_qe2 = { + .b = false, + .u8 = 65, + }; + + uint8_t wire_q[] = { + /* i16 */ 0xfe, 0x0, + /* start of element 0 of q */ 0x01, + /* .b */ 0x01, + /* .u8 */ 0x82, + /* start of element 1 of q */ 0x01, + /* b */ 0x00, + /* u8 */ 0x41, + /* end of q */ 0x00, + /* i32 */ 0x00, 0x01, 0x11, 0x70, + QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */ + }; + + QTAILQ_INIT(&obj_q.q); + QTAILQ_INSERT_TAIL(&obj_q.q, &obj_qe1, next); + QTAILQ_INSERT_TAIL(&obj_q.q, &obj_qe2, next); + + save_vmstate(&vmstate_q, &obj_q); + compare_vmstate(wire_q, sizeof(wire_q)); +} + +static void test_load_q(void) +{ + TestQtailq obj_q = { + .i16 = -512, + .i32 = 70000, + }; + + TestQtailqElement obj_qe1 = { + .b = true, + .u8 = 130, + }; + + TestQtailqElement obj_qe2 = { + .b = false, + .u8 = 65, + }; + + uint8_t wire_q[] = { + /* i16 */ 0xfe, 0x0, + /* start of element 0 of q */ 0x01, + /* .b */ 0x01, + /* .u8 */ 0x82, + /* start of element 1 of q */ 0x01, + /* b */ 0x00, + /* u8 */ 0x41, + /* end of q */ 0x00, + /* i32 */ 0x00, 0x01, 0x11, 0x70, + }; + + QTAILQ_INIT(&obj_q.q); + QTAILQ_INSERT_TAIL(&obj_q.q, &obj_qe1, next); + QTAILQ_INSERT_TAIL(&obj_q.q, &obj_qe2, next); + + QEMUFile *fsave = open_test_file(true); + + qemu_put_buffer(fsave, wire_q, sizeof(wire_q)); + qemu_put_byte(fsave, QEMU_VM_EOF); + g_assert(!qemu_file_get_error(fsave)); + qemu_fclose(fsave); + + QEMUFile *fload = open_test_file(false); + TestQtailq tgt; + + QTAILQ_INIT(&tgt.q); + vmstate_load_state(fload, &vmstate_q, &tgt, 1); + char eof = qemu_get_byte(fload); + g_assert(!qemu_file_get_error(fload)); + g_assert_cmpint(tgt.i16, ==, obj_q.i16); + g_assert_cmpint(tgt.i32, ==, obj_q.i32); + g_assert_cmpint(eof, ==, QEMU_VM_EOF); + + TestQtailqElement *qele_from = QTAILQ_FIRST(&obj_q.q); + TestQtailqElement *qlast_from = QTAILQ_LAST(&obj_q.q, TestQtailqHead); + TestQtailqElement *qele_to = QTAILQ_FIRST(&tgt.q); + TestQtailqElement *qlast_to = QTAILQ_LAST(&tgt.q, TestQtailqHead); + + while (1) { + g_assert_cmpint(qele_to->b, ==, qele_from->b); + g_assert_cmpint(qele_to->u8, ==, qele_from->u8); + if ((qele_from == qlast_from) || (qele_to == qlast_to)) { + break; + } + qele_from = QTAILQ_NEXT(qele_from, next); + qele_to = QTAILQ_NEXT(qele_to, next); + } + + g_assert_cmpint((uint64_t) qele_from, ==, (uint64_t) qlast_from); + g_assert_cmpint((uint64_t) qele_to, ==, (uint64_t) qlast_to); + + /* clean up */ + TestQtailqElement *qele; + while (!QTAILQ_EMPTY(&tgt.q)) { + qele = QTAILQ_LAST(&tgt.q, TestQtailqHead); + QTAILQ_REMOVE(&tgt.q, qele, next); + free(qele); + qele = NULL; + } + qemu_fclose(fload); +} + int main(int argc, char **argv) { temp_fd = mkstemp(temp_file); @@ -562,6 +719,9 @@ int main(int argc, char **argv) test_arr_ptr_str_no0_save); g_test_add_func("/vmstate/array/ptr/str/no0/load", test_arr_ptr_str_no0_load); + g_test_add_func("/vmstate/qtailq/save/saveq", test_save_q); + g_test_add_func("/vmstate/qtailq/load/loadq", test_load_q); + g_test_run(); close(temp_fd); -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [QEMU PATCH v13 4/4] migration: add error_report 2016-11-17 0:07 [Qemu-devel] [QEMU PATCH v13 0/4] migration: migrate QTAILQ Jianjun Duan ` (2 preceding siblings ...) 2016-11-17 0:07 ` [Qemu-devel] [QEMU PATCH v13 3/4] tests/migration: Add test for QTAILQ migration Jianjun Duan @ 2016-11-17 0:07 ` Jianjun Duan 2016-11-18 17:22 ` [Qemu-devel] [QEMU PATCH v13 0/4] migration: migrate QTAILQ Jianjun Duan 4 siblings, 0 replies; 7+ messages in thread From: Jianjun Duan @ 2016-11-17 0:07 UTC (permalink / raw) To: qemu-devel Cc: qemu-ppc, duanj, dmitry, peter.maydell, kraxel, mst, david, pbonzini, veroniabahaa, quintela, amit.shah, mreitz, kwolf, rth, aurelien, leon.alrae, blauwirbel, mark.cave-ayland, mdroth, dgilbert Added error_report where version_ids do not match in vmstate_load_state. Signed-off-by: Jianjun Duan <duanj@linux.vnet.ibm.com> --- migration/vmstate.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/migration/vmstate.c b/migration/vmstate.c index 2f9d4ba..0e6fce4 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -85,6 +85,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; } @@ -95,6 +96,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; } -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [QEMU PATCH v13 0/4] migration: migrate QTAILQ 2016-11-17 0:07 [Qemu-devel] [QEMU PATCH v13 0/4] migration: migrate QTAILQ Jianjun Duan ` (3 preceding siblings ...) 2016-11-17 0:07 ` [Qemu-devel] [QEMU PATCH v13 4/4] migration: add error_report Jianjun Duan @ 2016-11-18 17:22 ` Jianjun Duan 4 siblings, 0 replies; 7+ messages in thread From: Jianjun Duan @ 2016-11-18 17:22 UTC (permalink / raw) To: qemu-devel Cc: qemu-ppc, dmitry, peter.maydell, kraxel, mst, david, pbonzini, veroniabahaa, quintela, amit.shah, mreitz, kwolf, rth, aurelien, leon.alrae, blauwirbel, mark.cave-ayland, mdroth, dgilbert ping On 11/16/2016 04:07 PM, Jianjun Duan wrote: > Hi all, > > I addressed some review comments. Comments are welcome. > > v13: - Changed some QTAILQ related macro names to match existing ones. > > Previous versions are: > > v12: - Fixed type for put_qtailq which caused build break. > (link: http://lists.gnu.org/archive/html/qemu-devel/2016-11/msg01328.html > > v11: - Split error_report statements into a separate patch. > - Changed the signature of put. It now returns int type. > - Minor changes to QTAILQ macros. > > v10: - Fixed a typo. > (link: http://lists.nongnu.org/archive/html/qemu-ppc/2016-10/msg01206.html) > > v9: - No more hard encoding of QTAILQ layout information > (link: http://lists.nongnu.org/archive/html/qemu-ppc/2016-10/msg01042.html) > > v8: - Fixed a style issue. > (link: http://lists.nongnu.org/archive/html/qemu-ppc/2016-10/msg00874.html) > > v7: - Fixed merge errors. > - Simplified macro definitions related to pointer arithmetic based QTAILQ access. > - Added test case for QTAILQ migration in tests/test-vmstate.c. > (link: http://lists.nongnu.org/archive/html/qemu-ppc/2016-10/msg00711.html) > > > v6: - Split from Power specific patches. > - Dropped VMS_LINKED flag. > - Rebased to master. > - Added comments to clarify about put/get in VMStateInfo. > (link: http://lists.nongnu.org/archive/html/qemu-ppc/2016-10/msg00336.html) > > v5: - Rebased to David's ppc-for-2.8. > (link: https://lists.nongnu.org/archive/html/qemu-devel/2016-10/msg00270.html) > > v4: - Introduce a way to set customized instance_id in SaveStateEntry. Use it > to set instance_id for DRC using its unique index to address David > Gibson's concern. > - Rename VMS_CSTM to VMS_LINKED based on Paolo Bonzini's suggestions. > - Clean up qjson stuff in put_qtailq. > - Add trace for put_qtailq and get_qtailq based on David Gilbert's > suggestion. > - Based on David's ppc-for-2.7. > (link: https://lists.nongnu.org/archive/html/qemu-devel/2016-06/msg07720.html) > > v3: - Simplify overall design followng discussion with Paolo. No longer need > metadata to migrate QTAILQ. > - Extend VMStateInfo instead of adding similar fields to VMStateField. > - Clean up macros in qemu/queue.h. > (link: https://lists.nongnu.org/archive/html/qemu-devel/2016-05/msg05695.html) > > v2: - Introduce a general approach to migrate QTAILQ in qemu/queue.h. > - Migrate signalled field in the DRC state. > - Put the newly added migrating fields in subsections so that backward > migration is not broken. > - Set detach_cb field right after migration so that a migrated hot-unplug > event could finish its course. > (link: https://lists.nongnu.org/archive/html/qemu-devel/2016-05/msg04188.html) > > v1: - Inital version. > (link: https://lists.nongnu.org/archive/html/qemu-devel/2016-04/msg02601.html) > > > Jianjun Duan (4): > migration: extend VMStateInfo > migration: migrate QTAILQ > tests/migration: Add test for QTAILQ migration > migration: add error_report > > 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 | 39 ++++++++-- > include/qemu/queue.h | 60 +++++++++++++++ > migration/savevm.c | 7 +- > migration/trace-events | 4 + > migration/vmstate.c | 184 +++++++++++++++++++++++++++++++++++--------- > 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 +- > tests/test-vmstate.c | 160 ++++++++++++++++++++++++++++++++++++++ > 25 files changed, 577 insertions(+), 105 deletions(-) > ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-11-23 16:29 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-11-17 0:07 [Qemu-devel] [QEMU PATCH v13 0/4] migration: migrate QTAILQ Jianjun Duan 2016-11-17 0:07 ` [Qemu-devel] [QEMU PATCH v13 1/4] migration: extend VMStateInfo Jianjun Duan 2016-11-23 16:29 ` Dr. David Alan Gilbert 2016-11-17 0:07 ` [Qemu-devel] [QEMU PATCH v13 2/4] migration: migrate QTAILQ Jianjun Duan 2016-11-17 0:07 ` [Qemu-devel] [QEMU PATCH v13 3/4] tests/migration: Add test for QTAILQ migration Jianjun Duan 2016-11-17 0:07 ` [Qemu-devel] [QEMU PATCH v13 4/4] migration: add error_report Jianjun Duan 2016-11-18 17:22 ` [Qemu-devel] [QEMU PATCH v13 0/4] migration: migrate QTAILQ Jianjun Duan
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.