[073/124] vmstate: Remove version parameter from VMSTATE_STRUCT_ARRAY

diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 2a27a19..9ac05d8 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -949,7 +949,7 @@  static const VMStateDescription mv88w8618_pit_vmsd = {
     .version_id = 1,
     .minimum_version_id = 1,
     .fields = (VMStateField[]) {
-        VMSTATE_STRUCT_ARRAY(timer, mv88w8618_pit_state, 4, 1,
+        VMSTATE_STRUCT_ARRAY(timer, mv88w8618_pit_state, 4,
                              mv88w8618_timer_vmsd, mv88w8618_timer_state),
         VMSTATE_END_OF_LIST()
     }
diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c
index 45cb118..af00545 100644
--- a/hw/audio/ac97.c
+++ b/hw/audio/ac97.c
@@ -1216,7 +1216,7 @@  static const VMStateDescription vmstate_ac97 = {
         VMSTATE_UINT32 (glob_cnt, AC97LinkState),
         VMSTATE_UINT32 (glob_sta, AC97LinkState),
         VMSTATE_UINT32 (cas, AC97LinkState),
-        VMSTATE_STRUCT_ARRAY (bm_regs, AC97LinkState, 3, 1,
+        VMSTATE_STRUCT_ARRAY (bm_regs, AC97LinkState, 3,
                               vmstate_ac97_bm_regs, AC97BusMasterRegs),
         VMSTATE_BUFFER (mixer_data, AC97LinkState),
         VMSTATE_UNUSED_TEST (is_version_2, 3),
diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c
index 5dbf803..b4cfe5d 100644
--- a/hw/audio/es1370.c
+++ b/hw/audio/es1370.c
@@ -999,7 +999,7 @@  static const VMStateDescription vmstate_es1370 = {
     .post_load = es1370_post_load,
     .fields = (VMStateField[]) {
         VMSTATE_PCI_DEVICE (dev, ES1370State),
-        VMSTATE_STRUCT_ARRAY (chan, ES1370State, NB_CHANNELS, 2,
+        VMSTATE_STRUCT_ARRAY (chan, ES1370State, NB_CHANNELS,
                               vmstate_es1370_channel, struct chan),
         VMSTATE_UINT32 (ctl, ES1370State),
         VMSTATE_UINT32 (status, ES1370State),
diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
index 1c1a138..76f4d3c 100644
--- a/hw/audio/hda-codec.c
+++ b/hw/audio/hda-codec.c
@@ -599,8 +599,7 @@  static const VMStateDescription vmstate_hda_audio = {
     .version_id = 2,
     .post_load = hda_audio_post_load,
     .fields = (VMStateField[]) {
-        VMSTATE_STRUCT_ARRAY(st, HDAAudioState, 4, 0,
-                             vmstate_hda_audio_stream,
+        VMSTATE_STRUCT_ARRAY(st, HDAAudioState, 4, vmstate_hda_audio_stream,
                              HDAAudioStream),
         VMSTATE_BOOL_ARRAY(running_compat, HDAAudioState, 16),
         VMSTATE_BOOL_ARRAY_TEST(running_real, HDAAudioState, 2 * 16,
diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
index 1c660a4..426d178 100644
--- a/hw/audio/intel-hda.c
+++ b/hw/audio/intel-hda.c
@@ -1220,8 +1220,7 @@  static const VMStateDescription vmstate_intel_hda = {
         VMSTATE_UINT32(icw, IntelHDAState),
         VMSTATE_UINT32(irr, IntelHDAState),
         VMSTATE_UINT32(ics, IntelHDAState),
-        VMSTATE_STRUCT_ARRAY(st, IntelHDAState, 8, 0,
-                             vmstate_intel_hda_stream,
+        VMSTATE_STRUCT_ARRAY(st, IntelHDAState, 8, vmstate_intel_hda_stream,
                              IntelHDAStream),

         /* additional state info */
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index ca973f4..9d8d5d5 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -767,7 +767,7 @@  static const VMStateDescription vmstate_fdc = {
         VMSTATE_UINT8(lock, FDCtrl),
         VMSTATE_UINT8(pwrd, FDCtrl),
         VMSTATE_UINT8_EQUAL(num_floppies, FDCtrl),
-        VMSTATE_STRUCT_ARRAY(drives, FDCtrl, MAX_FD, 1,
+        VMSTATE_STRUCT_ARRAY(drives, FDCtrl, MAX_FD,
                              vmstate_fdrive, FDrive),
         VMSTATE_END_OF_LIST()
     }
diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c
index c8d5cdb..9e53ee7 100644
--- a/hw/char/ipoctal232.c
+++ b/hw/char/ipoctal232.c
@@ -153,9 +153,9 @@  static const VMStateDescription vmstate_ipoctal = {
     .minimum_version_id = 1,
     .fields = (VMStateField[]) {
         VMSTATE_IPACK_DEVICE(parent_obj, IPOctalState),
-        VMSTATE_STRUCT_ARRAY(ch, IPOctalState, N_CHANNELS, 1,
+        VMSTATE_STRUCT_ARRAY(ch, IPOctalState, N_CHANNELS,
                              vmstate_scc2698_channel, SCC2698Channel),
-        VMSTATE_STRUCT_ARRAY(blk, IPOctalState, N_BLOCKS, 1,
+        VMSTATE_STRUCT_ARRAY(blk, IPOctalState, N_BLOCKS,
                              vmstate_scc2698_block, SCC2698Block),
         VMSTATE_UINT8(irq_vector, IPOctalState),
         VMSTATE_END_OF_LIST()
diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c
index 44f50c3..25c930b 100644
--- a/hw/char/serial-pci.c
+++ b/hw/char/serial-pci.c
@@ -169,7 +169,7 @@  static const VMStateDescription vmstate_pci_multi_serial = {
     .fields = (VMStateField[]) {
         VMSTATE_PCI_DEVICE(dev, PCIMultiSerialState),
         VMSTATE_STRUCT_ARRAY(state, PCIMultiSerialState, PCI_SERIAL_MAX_PORTS,
-                             0, vmstate_serial, SerialState),
+                             vmstate_serial, SerialState),
         VMSTATE_UINT32_ARRAY(level, PCIMultiSerialState, PCI_SERIAL_MAX_PORTS),
         VMSTATE_END_OF_LIST()
     }
diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c
index 45c62af..d4afae9 100644
--- a/hw/display/exynos4210_fimd.c
+++ b/hw/display/exynos4210_fimd.c
@@ -1893,7 +1893,7 @@  static const VMStateDescription exynos4210_fimd_vmstate = {
         VMSTATE_UINT32(hueoffset, Exynos4210fimdState),
         VMSTATE_UINT32_ARRAY(i80ifcmd, Exynos4210fimdState, 12),
         VMSTATE_UINT32(blendcon, Exynos4210fimdState),
-        VMSTATE_STRUCT_ARRAY(window, Exynos4210fimdState, 5, 1,
+        VMSTATE_STRUCT_ARRAY(window, Exynos4210fimdState, 5,
                 exynos4210_fimd_window_vmstate, Exynos4210fimdWindow),
         VMSTATE_END_OF_LIST()
     }
diff --git a/hw/display/pxa2xx_lcd.c b/hw/display/pxa2xx_lcd.c
index 80edb70..f9428d5 100644
--- a/hw/display/pxa2xx_lcd.c
+++ b/hw/display/pxa2xx_lcd.c
@@ -972,7 +972,7 @@  static const VMStateDescription vmstate_pxa2xx_lcdc = {
         VMSTATE_UINT32(tcr, PXA2xxLCDState),
         VMSTATE_UINT32(liidr, PXA2xxLCDState),
         VMSTATE_UINT8(bscntr, PXA2xxLCDState),
-        VMSTATE_STRUCT_ARRAY(dma_ch, PXA2xxLCDState, 7, 0,
+        VMSTATE_STRUCT_ARRAY(dma_ch, PXA2xxLCDState, 7,
                              vmstate_dma_channel, struct DMAChannel),
         VMSTATE_END_OF_LIST()
     }
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 9dd4e22..4114427 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -2265,7 +2265,7 @@  static VMStateDescription qxl_vmstate = {
         VMSTATE_UINT32(mode, PCIQXLDevice),
         VMSTATE_UINT32(ssd.unique, PCIQXLDevice),
         VMSTATE_INT32_EQUAL(num_memslots, PCIQXLDevice),
-        VMSTATE_STRUCT_ARRAY(guest_slots, PCIQXLDevice, NUM_MEMSLOTS, 0,
+        VMSTATE_STRUCT_ARRAY(guest_slots, PCIQXLDevice, NUM_MEMSLOTS,
                              qxl_memslot, struct guest_slots),
         VMSTATE_STRUCT(guest_primary.surface, PCIQXLDevice, 0,
                        qxl_surface, QXLSurfaceCreate),
diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index dd370ed..40d56fd 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -580,7 +580,8 @@  static const VMStateDescription vmstate_dma = {
         VMSTATE_UINT8(mask, struct dma_cont),
         VMSTATE_UINT8(flip_flop, struct dma_cont),
         VMSTATE_INT32(dshift, struct dma_cont),
-        VMSTATE_STRUCT_ARRAY(regs, struct dma_cont, 4, 1, vmstate_dma_regs, struct dma_regs),
+        VMSTATE_STRUCT_ARRAY(regs, struct dma_cont, 4,
+                             vmstate_dma_regs, struct dma_regs),
         VMSTATE_END_OF_LIST()
     }
 };
diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
index 741dd20..a71ab21 100644
--- a/hw/dma/pl080.c
+++ b/hw/dma/pl080.c
@@ -89,7 +89,7 @@  static const VMStateDescription vmstate_pl080 = {
         VMSTATE_UINT8(tc_int, PL080State),
         VMSTATE_UINT8(tc_int, PL080State),
         VMSTATE_STRUCT_ARRAY(chan, PL080State, PL080_MAX_CHANNELS,
-                             1, vmstate_pl080_channel, pl080_channel),
+                             vmstate_pl080_channel, pl080_channel),
         VMSTATE_INT32(running, PL080State),
         VMSTATE_END_OF_LIST()
     }
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index d771308..23330be 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -521,7 +521,7 @@  extern const VMStateDescription vmstate_ide_bus;
     VMSTATE_STRUCT(_field, _state, 1, vmstate_ide_bus, IDEBus)

 #define VMSTATE_IDE_BUS_ARRAY(_field, _state, _num)              \
-    VMSTATE_STRUCT_ARRAY(_field, _state, _num, 1, vmstate_ide_bus, IDEBus)
+    VMSTATE_STRUCT_ARRAY(_field, _state, _num, vmstate_ide_bus, IDEBus)

 extern const VMStateDescription vmstate_ide_drive;

diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 6257a21..9136ec9 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -479,8 +479,7 @@  const VMStateDescription vmstate_ide_pci = {
     .post_load = ide_pci_post_load,
     .fields = (VMStateField[]) {
         VMSTATE_PCI_DEVICE(parent_obj, PCIIDEState),
-        VMSTATE_STRUCT_ARRAY(bmdma, PCIIDEState, 2, 0,
-                             vmstate_bmdma, BMDMAState),
+        VMSTATE_STRUCT_ARRAY(bmdma, PCIIDEState, 2, vmstate_bmdma, BMDMAState),
         VMSTATE_IDE_BUS_ARRAY(bus, PCIIDEState, 2),
         VMSTATE_IDE_DRIVES(bus[0].ifs, PCIIDEState),
         VMSTATE_IDE_DRIVES(bus[1].ifs, PCIIDEState),
diff --git a/hw/input/hid.c b/hw/input/hid.c
index bb0fa6a..35ec26d 100644
--- a/hw/input/hid.c
+++ b/hw/input/hid.c
@@ -468,7 +468,7 @@  const VMStateDescription vmstate_hid_ptr_device = {
     .minimum_version_id = 1,
     .post_load = hid_post_load,
     .fields = (VMStateField[]) {
-        VMSTATE_STRUCT_ARRAY(ptr.queue, HIDState, QUEUE_LENGTH, 0,
+        VMSTATE_STRUCT_ARRAY(ptr.queue, HIDState, QUEUE_LENGTH,
                              vmstate_hid_ptr_queue, HIDPointerEvent),
         VMSTATE_UINT32(head, HIDState),
         VMSTATE_UINT32(n, HIDState),
diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c
index 6d884ec..95ae9bc 100644
--- a/hw/intc/arm_gic_common.c
+++ b/hw/intc/arm_gic_common.c
@@ -65,7 +65,7 @@  static const VMStateDescription vmstate_gic = {
     .fields = (VMStateField[]) {
         VMSTATE_BOOL(enabled, GICState),
         VMSTATE_BOOL_ARRAY(cpu_enabled, GICState, GIC_NCPU),
-        VMSTATE_STRUCT_ARRAY(irq_state, GICState, GIC_MAXIRQ, 1,
+        VMSTATE_STRUCT_ARRAY(irq_state, GICState, GIC_MAXIRQ,
                              vmstate_gic_irq_state, gic_irq_state),
         VMSTATE_UINT8_ARRAY(irq_target, GICState, GIC_MAXIRQ),
         VMSTATE_UINT8_2DARRAY(priority1, GICState, GIC_INTERNAL, GIC_NCPU),
diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c
index a6b7028..b4efb45 100644
--- a/hw/intc/exynos4210_combiner.c
+++ b/hw/intc/exynos4210_combiner.c
@@ -89,7 +89,7 @@  static const VMStateDescription vmstate_exynos4210_combiner = {
     .version_id = 1,
     .minimum_version_id = 1,
     .fields = (VMStateField[]) {
-        VMSTATE_STRUCT_ARRAY(group, Exynos4210CombinerState, IIC_NGRP, 0,
+        VMSTATE_STRUCT_ARRAY(group, Exynos4210CombinerState, IIC_NGRP,
                 vmstate_exynos4210_combiner_group_state, CombinerGroupState),
         VMSTATE_UINT32_ARRAY(reg_set, Exynos4210CombinerState,
                 IIC_REGSET_SIZE),
diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c
index 9ff3119..8844231 100644
--- a/hw/intc/heathrow_pic.c
+++ b/hw/intc/heathrow_pic.c
@@ -173,7 +173,7 @@  static const VMStateDescription vmstate_heathrow_pic = {
     .version_id = 1,
     .minimum_version_id = 1,
     .fields = (VMStateField[]) {
-        VMSTATE_STRUCT_ARRAY(pics, HeathrowPICS, 2, 1,
+        VMSTATE_STRUCT_ARRAY(pics, HeathrowPICS, 2,
                              vmstate_heathrow_pic_one, HeathrowPIC),
         VMSTATE_END_OF_LIST()
     }
diff --git a/hw/intc/slavio_intctl.c b/hw/intc/slavio_intctl.c
index f22aba0..47debaf 100644
--- a/hw/intc/slavio_intctl.c
+++ b/hw/intc/slavio_intctl.c
@@ -393,7 +393,7 @@  static const VMStateDescription vmstate_intctl = {
     .minimum_version_id = 1,
     .post_load = vmstate_intctl_post_load,
     .fields = (VMStateField[]) {
-        VMSTATE_STRUCT_ARRAY(slaves, SLAVIO_INTCTLState, MAX_CPUS, 1,
+        VMSTATE_STRUCT_ARRAY(slaves, SLAVIO_INTCTLState, MAX_CPUS,
                              vmstate_intctl_cpu, SLAVIO_CPUINTCTLState),
         VMSTATE_UINT32(intregm_pending, SLAVIO_INTCTLState),
         VMSTATE_UINT32(intregm_disabled, SLAVIO_INTCTLState),
diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index ff6051d..3c65d2b 100644
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -649,7 +649,7 @@  static const VMStateDescription vmstate_cuda = {
         VMSTATE_BUFFER(data_in, CUDAState),
         VMSTATE_BUFFER(data_out, CUDAState),
         VMSTATE_UINT32(tick_offset, CUDAState),
-        VMSTATE_STRUCT_ARRAY(timers, CUDAState, 2, 1,
+        VMSTATE_STRUCT_ARRAY(timers, CUDAState, 2,
                              vmstate_cuda_timer, CUDATimer),
         VMSTATE_END_OF_LIST()
     }
diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c
index 3335476..fa02282 100644
--- a/hw/misc/macio/mac_dbdma.c
+++ b/hw/misc/macio/mac_dbdma.c
@@ -730,7 +730,7 @@  static const VMStateDescription vmstate_dbdma = {
     .version_id = 2,
     .minimum_version_id = 2,
     .fields = (VMStateField[]) {
-        VMSTATE_STRUCT_ARRAY(channels, DBDMAState, DBDMA_CHANNELS, 1,
+        VMSTATE_STRUCT_ARRAY(channels, DBDMAState, DBDMA_CHANNELS,
                              vmstate_dbdma_channel, DBDMA_channel),
         VMSTATE_END_OF_LIST()
     }
diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c
index d780ba0..e6c809e 100644
--- a/hw/net/allwinner_emac.c
+++ b/hw/net/allwinner_emac.c
@@ -507,7 +507,7 @@  static const VMStateDescription vmstate_aw_emac = {
         VMSTATE_UINT32(rx_num_packets, AwEmacState),
         VMSTATE_UINT32(rx_packet_size, AwEmacState),
         VMSTATE_UINT32(rx_packet_pos, AwEmacState),
-        VMSTATE_STRUCT_ARRAY(tx_fifo, AwEmacState, NUM_TX_FIFOS, 1,
+        VMSTATE_STRUCT_ARRAY(tx_fifo, AwEmacState, NUM_TX_FIFOS,
                              vmstate_fifo8, Fifo8),
         VMSTATE_UINT32_ARRAY(tx_length, AwEmacState, NUM_TX_FIFOS),
         VMSTATE_UINT32(tx_channel, AwEmacState),
diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index e12d731..5c0e73c 100644
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -305,9 +305,9 @@  static const VMStateDescription vmstate_ppce500_pci = {
     .version_id = 1,
     .minimum_version_id = 1,
     .fields = (VMStateField[]) {
-        VMSTATE_STRUCT_ARRAY(pob, PPCE500PCIState, PPCE500_PCI_NR_POBS, 1,
+        VMSTATE_STRUCT_ARRAY(pob, PPCE500PCIState, PPCE500_PCI_NR_POBS,
                              vmstate_pci_outbound, struct pci_outbound),
-        VMSTATE_STRUCT_ARRAY(pib, PPCE500PCIState, PPCE500_PCI_NR_PIBS, 1,
+        VMSTATE_STRUCT_ARRAY(pib, PPCE500PCIState, PPCE500_PCI_NR_PIBS,
                              vmstate_pci_outbound, struct pci_inbound),
         VMSTATE_UINT32(gasket_time, PPCE500PCIState),
         VMSTATE_END_OF_LIST()
diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c
index 55a3cab..4672787 100644
--- a/hw/ppc/ppc4xx_pci.c
+++ b/hw/ppc/ppc4xx_pci.c
@@ -319,12 +319,10 @@  static const VMStateDescription vmstate_ppc4xx_pci = {
     .version_id = 1,
     .minimum_version_id = 1,
     .fields = (VMStateField[]) {
-        VMSTATE_STRUCT_ARRAY(pmm, PPC4xxPCIState, PPC4xx_PCI_NR_PMMS, 1,
-                             vmstate_pci_master_map,
-                             struct PCIMasterMap),
-        VMSTATE_STRUCT_ARRAY(ptm, PPC4xxPCIState, PPC4xx_PCI_NR_PTMS, 1,
-                             vmstate_pci_target_map,
-                             struct PCITargetMap),
+        VMSTATE_STRUCT_ARRAY(pmm, PPC4xxPCIState, PPC4xx_PCI_NR_PMMS,
+                             vmstate_pci_master_map, struct PCIMasterMap),
+        VMSTATE_STRUCT_ARRAY(ptm, PPC4xxPCIState, PPC4xx_PCI_NR_PTMS,
+                             vmstate_pci_target_map, struct PCITargetMap),
         VMSTATE_END_OF_LIST()
     }
 };
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index a4a51d4..ac93f82 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -690,9 +690,9 @@  static const VMStateDescription vmstate_spapr_pci = {
         VMSTATE_UINT64_EQUAL(mem_win_size, sPAPRPHBState),
         VMSTATE_UINT64_EQUAL(io_win_addr, sPAPRPHBState),
         VMSTATE_UINT64_EQUAL(io_win_size, sPAPRPHBState),
-        VMSTATE_STRUCT_ARRAY(lsi_table, sPAPRPHBState, PCI_NUM_PINS, 0,
+        VMSTATE_STRUCT_ARRAY(lsi_table, sPAPRPHBState, PCI_NUM_PINS,
                              vmstate_spapr_pci_lsi, struct spapr_pci_lsi),
-        VMSTATE_STRUCT_ARRAY(msi_table, sPAPRPHBState, SPAPR_MSIX_MAX_DEVS, 0,
+        VMSTATE_STRUCT_ARRAY(msi_table, sPAPRPHBState, SPAPR_MSIX_MAX_DEVS,
                              vmstate_spapr_pci_msi, struct spapr_pci_msi),

         VMSTATE_END_OF_LIST()
diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c
index 52bbbbc..0318c9c 100644
--- a/hw/timer/cadence_ttc.c
+++ b/hw/timer/cadence_ttc.c
@@ -464,8 +464,7 @@  static const VMStateDescription vmstate_cadence_ttc = {
     .version_id = 1,
     .minimum_version_id = 1,
     .fields = (VMStateField[]) {
-        VMSTATE_STRUCT_ARRAY(timer, CadenceTTCState, 3, 0,
-                            vmstate_cadence_timer,
+        VMSTATE_STRUCT_ARRAY(timer, CadenceTTCState, 3, vmstate_cadence_timer,
                             CadenceTimerState),
         VMSTATE_END_OF_LIST()
     }
diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c
index 01e750e..0fd8d24 100644
--- a/hw/timer/exynos4210_mct.c
+++ b/hw/timer/exynos4210_mct.c
@@ -348,7 +348,7 @@  static const VMStateDescription vmstate_exynos4210_mct_state = {
     .minimum_version_id = 1,
     .fields = (VMStateField[]) {
         VMSTATE_UINT32(reg_mct_cfg, Exynos4210MCTState),
-        VMSTATE_STRUCT_ARRAY(l_timer, Exynos4210MCTState, 2, 0,
+        VMSTATE_STRUCT_ARRAY(l_timer, Exynos4210MCTState, 2,
             vmstate_exynos4210_mct_lt, Exynos4210MCTLT),
         VMSTATE_STRUCT(g_timer, Exynos4210MCTState, 0,
             vmstate_exynos4210_mct_gt, Exynos4210MCTGT),
diff --git a/hw/timer/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c
index 1c1a2b8..34fd2b3 100644
--- a/hw/timer/exynos4210_pwm.c
+++ b/hw/timer/exynos4210_pwm.c
@@ -139,8 +139,8 @@  static const VMStateDescription vmstate_exynos4210_pwm_state = {
         VMSTATE_UINT32(reg_tcon, Exynos4210PWMState),
         VMSTATE_UINT32(reg_tint_cstat, Exynos4210PWMState),
         VMSTATE_STRUCT_ARRAY(timer, Exynos4210PWMState,
-            EXYNOS4210_PWM_TIMERS_NUM, 0,
-        vmstate_exynos4210_pwm, Exynos4210PWM),
+                             EXYNOS4210_PWM_TIMERS_NUM,
+                             vmstate_exynos4210_pwm, Exynos4210PWM),
         VMSTATE_END_OF_LIST()
     }
 };
diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c
index 130e9dc..393a792 100644
--- a/hw/timer/pxa2xx_timer.c
+++ b/hw/timer/pxa2xx_timer.c
@@ -512,8 +512,8 @@  static const VMStateDescription vmstate_pxa2xx_timer_regs = {
         VMSTATE_INT32(clock, PXA2xxTimerInfo),
         VMSTATE_INT32(oldclock, PXA2xxTimerInfo),
         VMSTATE_UINT64(lastload, PXA2xxTimerInfo),
-        VMSTATE_STRUCT_ARRAY(timer, PXA2xxTimerInfo, 4, 1,
-                        vmstate_pxa2xx_timer0_regs, PXA2xxTimer0),
+        VMSTATE_STRUCT_ARRAY(timer, PXA2xxTimerInfo, 4,
+                             vmstate_pxa2xx_timer0_regs, PXA2xxTimer0),
         VMSTATE_UINT32(events, PXA2xxTimerInfo),
         VMSTATE_UINT32(irq_enabled, PXA2xxTimerInfo),
         VMSTATE_UINT32(reset3, PXA2xxTimerInfo),
diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c
index 45d97e6..1616bcb 100644
--- a/hw/timer/slavio_timer.c
+++ b/hw/timer/slavio_timer.c
@@ -345,7 +345,7 @@  static const VMStateDescription vmstate_slavio_timer = {
     .version_id = 3,
     .minimum_version_id = 3,
     .fields = (VMStateField[]) {
-        VMSTATE_STRUCT_ARRAY(cputimer, SLAVIO_TIMERState, MAX_CPUS + 1, 3,
+        VMSTATE_STRUCT_ARRAY(cputimer, SLAVIO_TIMERState, MAX_CPUS + 1,
                              vmstate_timer, CPUTimerState),
         VMSTATE_END_OF_LIST()
     }
diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index 7492174..5756856 100644
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.c
@@ -553,7 +553,7 @@  static const VMStateDescription vmstate_usb_hub = {
     .minimum_version_id = 1,
     .fields = (VMStateField[]) {
         VMSTATE_USB_DEVICE(dev, USBHubState),
-        VMSTATE_STRUCT_ARRAY(ports, USBHubState, NUM_PORTS, 0,
+        VMSTATE_STRUCT_ARRAY(ports, USBHubState, NUM_PORTS,
                              vmstate_usb_hub_port, USBHubPort),
         VMSTATE_END_OF_LIST()
     }
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index 470e69f..b72a578 100644
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -1419,11 +1419,11 @@  static VMStateDescription ccid_vmstate = {
         VMSTATE_BUFFER(abProtocolDataStructure.data, USBCCIDState),
         VMSTATE_UINT32(ulProtocolDataStructureSize, USBCCIDState),
         VMSTATE_STRUCT_ARRAY(bulk_in_pending, USBCCIDState,
-                       BULK_IN_PENDING_NUM, 1, bulk_in_vmstate, BulkIn),
+                       BULK_IN_PENDING_NUM, bulk_in_vmstate, BulkIn),
         VMSTATE_UINT32(bulk_in_pending_start, USBCCIDState),
         VMSTATE_UINT32(bulk_in_pending_end, USBCCIDState),
         VMSTATE_STRUCT_ARRAY(pending_answers, USBCCIDState,
-                        PENDING_ANSWERS_NUM, 1, answer_vmstate, Answer),
+                        PENDING_ANSWERS_NUM, answer_vmstate, Answer),
         VMSTATE_UINT32(pending_answers_num, USBCCIDState),
         VMSTATE_UINT8(migration_state, USBCCIDState),
         VMSTATE_UINT32(state_vmstate, USBCCIDState),
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index eb6a448..9133ff1 100644
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -447,7 +447,7 @@  static const VMStateDescription vmstate_uhci = {
     .fields = (VMStateField[]) {
         VMSTATE_PCI_DEVICE(dev, UHCIState),
         VMSTATE_UINT8_EQUAL(num_ports_vmstate, UHCIState),
-        VMSTATE_STRUCT_ARRAY(ports, UHCIState, NB_PORTS, 1,
+        VMSTATE_STRUCT_ARRAY(ports, UHCIState, NB_PORTS,
                              vmstate_uhci_port, UHCIPort),
         VMSTATE_UINT16(cmd, UHCIState),
         VMSTATE_UINT16(status, UHCIState),
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 287a505..9eff1ac 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -2321,7 +2321,7 @@  static const VMStateDescription usbredir_vmstate = {
             .flags        = VMS_SINGLE,
             .offset       = 0,
         },
-        VMSTATE_STRUCT_ARRAY(endpoint, USBRedirDevice, MAX_ENDPOINTS, 1,
+        VMSTATE_STRUCT_ARRAY(endpoint, USBRedirDevice, MAX_ENDPOINTS,
                              usbredir_ep_vmstate, struct endp_data),
         VMSTATE_STRUCT(cancelled, USBRedirDevice, 1,
                        usbredir_ep_packet_id_queue_vmstate,
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 90ac5b5..e540804 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -456,9 +456,8 @@  extern const VMStateInfo vmstate_info_bitmap;
 #define VMSTATE_STRUCT_POINTER(_field, _state, _vmsd, _type)          \
     VMSTATE_STRUCT_POINTER_TEST(_field, _state, NULL, _vmsd, _type)

-#define VMSTATE_STRUCT_ARRAY(_field, _state, _num, _version, _vmsd, _type) \
-    VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _num, NULL, _version,   \
-            _vmsd, _type)
+#define VMSTATE_STRUCT_ARRAY(_field, _state, _num, _vmsd, _type) \
+    VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _num, NULL, 0, _vmsd, _type)

 #define VMSTATE_BOOL_TEST(_f, _s, _t)                                 \
     VMSTATE_SINGLE(_f, _s, _t, vmstate_info_bool, bool)
diff --git a/target-i386/machine.c b/target-i386/machine.c
index 7bb3c14..4ebf128 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -29,7 +29,7 @@  static const VMStateDescription vmstate_segment = {
 }

 #define VMSTATE_SEGMENT_ARRAY(_field, _state, _n)                    \
-    VMSTATE_STRUCT_ARRAY(_field, _state, _n, 0, vmstate_segment, SegmentCache)
+    VMSTATE_STRUCT_ARRAY(_field, _state, _n, vmstate_segment, SegmentCache)

 static const VMStateDescription vmstate_xmm_reg = {
     .name = "xmm_reg",
@@ -43,7 +43,7 @@  static const VMStateDescription vmstate_xmm_reg = {
 };

 #define VMSTATE_XMM_REGS(_field, _state, _n)                         \
-    VMSTATE_STRUCT_ARRAY(_field, _state, _n, 0, vmstate_xmm_reg, XMMReg)
+    VMSTATE_STRUCT_ARRAY(_field, _state, _n, vmstate_xmm_reg, XMMReg)

 /* YMMH format is the same as XMM */
 static const VMStateDescription vmstate_ymmh_reg = {
@@ -73,7 +73,7 @@  static const VMStateDescription vmstate_bnd_regs = {
 };

 #define VMSTATE_BND_REGS(_field, _state, _n)          \
-    VMSTATE_STRUCT_ARRAY(_field, _state, _n, 0, vmstate_bnd_regs, BNDReg)
+    VMSTATE_STRUCT_ARRAY(_field, _state, _n, vmstate_bnd_regs, BNDReg)

 static const VMStateDescription vmstate_mtrr_var = {
     .name = "mtrr_var",