[Qemu-devel] [PATCH 074/124] vmstate: Remove version parameter from VMSTATE_STRUCT_ARRAY_TEST

[Juan Quintela]

No users left.

Signed-off-by: Juan Quintela <address@hidden>
---
 hw/char/escc.c              | 2 +-
 hw/ide/internal.h           | 2 +-
 hw/timer/i8254_common.c     | 2 +-
 hw/timer/pxa2xx_timer.c     | 2 +-
 hw/usb/hcd-xhci.c           | 2 +-
 include/hw/acpi/pcihp.h     | 2 +-
 include/migration/vmstate.h | 5 ++---
 target-i386/machine.c       | 6 ++----
 8 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/hw/char/escc.c b/hw/char/escc.c
index dc5768f..99dcb04 100644
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -678,7 +678,7 @@ static const VMStateDescription vmstate_escc = {
     .version_id = 2,
     .minimum_version_id = 1,
     .fields = (VMStateField[]) {
-        VMSTATE_STRUCT_ARRAY_TEST(chn, ESCCState, 2, vmstate_2_plus, 0,
+        VMSTATE_STRUCT_ARRAY_TEST(chn, ESCCState, 2, vmstate_2_plus,
                                   vmstate_escc_chn, ChannelState),
         VMSTATE_END_OF_LIST()
     }
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index 23330be..a75e524 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -526,7 +526,7 @@ extern const VMStateDescription vmstate_ide_bus;
 extern const VMStateDescription vmstate_ide_drive;

 #define VMSTATE_IDE_DRIVES(_field, _state) \
-    VMSTATE_STRUCT_ARRAY_TEST(_field, _state, 2, vmstate_3_plus, 0,\
+    VMSTATE_STRUCT_ARRAY_TEST(_field, _state, 2, vmstate_3_plus,\
                               vmstate_ide_drive, IDEState)

 void ide_bus_reset(IDEBus *bus);
diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c
index b7bd908..9e36a93 100644
--- a/hw/timer/i8254_common.c
+++ b/hw/timer/i8254_common.c
@@ -269,7 +269,7 @@ static const VMStateDescription vmstate_pit_common = {
         VMSTATE_UINT32_TEST(channels[0].irq_disabled, PITCommonState,
             vmstate_3_plus),
         VMSTATE_STRUCT_ARRAY_TEST(channels, PITCommonState, 3,
-                                  vmstate_2_plus, 0, vmstate_pit_channel,
+                                  vmstate_2_plus, vmstate_pit_channel,
                                   PITChannelState),
         VMSTATE_INT64(channels[0].next_transition_time,
                       PITCommonState), /* formerly irq_timer */
diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c
index 393a792..a8af5a0 100644
--- a/hw/timer/pxa2xx_timer.c
+++ b/hw/timer/pxa2xx_timer.c
@@ -519,7 +519,7 @@ static const VMStateDescription vmstate_pxa2xx_timer_regs = 
{
         VMSTATE_UINT32(reset3, PXA2xxTimerInfo),
         VMSTATE_UINT32(snapshot, PXA2xxTimerInfo),
         VMSTATE_STRUCT_ARRAY_TEST(tm4, PXA2xxTimerInfo, 8,
-                        pxa2xx_timer_has_tm4_test, 0,
+                        pxa2xx_timer_has_tm4_test,
                         vmstate_pxa2xx_timer4_regs, PXA2xxTimer4),
         VMSTATE_END_OF_LIST(),
     }
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index a95bd30..d1e4bd0 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -3737,7 +3737,7 @@ static const VMStateDescription vmstate_xhci_intr = {
         VMSTATE_UINT32_TEST(ev_buffer_put, XHCIInterrupter, xhci_er_full),
         VMSTATE_UINT32_TEST(ev_buffer_get, XHCIInterrupter, xhci_er_full),
         VMSTATE_STRUCT_ARRAY_TEST(ev_buffer, XHCIInterrupter, EV_QUEUE,
-                                  xhci_er_full, 1,
+                                  xhci_er_full,
                                   vmstate_xhci_event, XHCIEvent),

         VMSTATE_END_OF_LIST()
diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h
index 9323838..ac80832 100644
--- a/include/hw/acpi/pcihp.h
+++ b/include/hw/acpi/pcihp.h
@@ -68,7 +68,7 @@ extern const VMStateDescription vmstate_acpi_pcihp_pci_status;
                             test_pcihp), \
         VMSTATE_STRUCT_ARRAY_TEST(pcihp.acpi_pcihp_pci_status, state, \
                                   ACPI_PCIHP_MAX_HOTPLUG_BUS, \
-                                  test_pcihp, 1, \
+                                  test_pcihp, \
                                   vmstate_acpi_pcihp_pci_status, \
                                   AcpiPciHpPciStatus)

diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index e540804..46d46fb 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -313,11 +313,10 @@ extern const VMStateInfo vmstate_info_bitmap;
     .offset     = vmstate_offset_array(_s, _f, _type*, _n),          \
 }

-#define VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _num, _test, _version, 
_vmsd, _type) { \
+#define VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _num, _test, _vmsd, _type) { 
\
     .name         = (stringify(_field)),                             \
     .num          = (_num),                                          \
     .field_exists = (_test),                                         \
-    .version_id   = (_version),                                      \
     .vmsd         = &(_vmsd),                                        \
     .size         = sizeof(_type),                                   \
     .flags        = VMS_STRUCT|VMS_ARRAY,                            \
@@ -457,7 +456,7 @@ extern const VMStateInfo vmstate_info_bitmap;
     VMSTATE_STRUCT_POINTER_TEST(_field, _state, NULL, _vmsd, _type)

 #define VMSTATE_STRUCT_ARRAY(_field, _state, _num, _vmsd, _type) \
-    VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _num, NULL, 0, _vmsd, _type)
+    VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _num, NULL, _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 4ebf128..06061e1 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -58,8 +58,7 @@ static const VMStateDescription vmstate_ymmh_reg = {
 };

 #define VMSTATE_YMMH_REGS_VARS(_field, _state, _n, _t)                         
\
-    VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _n, _t, 0,\
-                              vmstate_ymmh_reg, XMMReg)
+    VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _n, _t, vmstate_ymmh_reg, XMMReg)

 static const VMStateDescription vmstate_bnd_regs = {
     .name = "bnd_regs",
@@ -87,8 +86,7 @@ static const VMStateDescription vmstate_mtrr_var = {
 };

 #define VMSTATE_MTRR_VARS(_field, _state, _n, _t)                    \
-    VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _n, _t, 0,\
-                              vmstate_mtrr_var, MTRRVar)
+    VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _n, _t, vmstate_mtrr_var, 
MTRRVar)

 static void put_fpreg_error(QEMUFile *f, void *opaque, size_t size)
 {
-- 
1.9.0