[Qemu-devel] [PATCH 078/124] vmstate: Remove version parameter from VMSTATE_VARRAY_UINT32

[Juan Quintela]

Signed-off-by: Juan Quintela <address@hidden>
---
 hw/nvram/ds1225y.c          | 2 +-
 hw/ppc/spapr_iommu.c        | 3 ++-
 include/migration/vmstate.h | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c
index 332598b..cfedfa8 100644
--- a/hw/nvram/ds1225y.c
+++ b/hw/nvram/ds1225y.c
@@ -97,7 +97,7 @@ static const VMStateDescription vmstate_nvram = {
     .minimum_version_id = 0,
     .post_load = nvram_post_load,
     .fields = (VMStateField[]) {
-        VMSTATE_VARRAY_UINT32(contents, NvRamState, chip_size, 0,
+        VMSTATE_VARRAY_UINT32(contents, NvRamState, chip_size,
                               vmstate_info_uint8, uint8_t),
         VMSTATE_END_OF_LIST()
     }
diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
index ce15751..9fda2b3 100644
--- a/hw/ppc/spapr_iommu.c
+++ b/hw/ppc/spapr_iommu.c
@@ -105,7 +105,8 @@ static const VMStateDescription vmstate_spapr_tce_table = {

         /* IOMMU state */
         VMSTATE_BOOL(bypass, sPAPRTCETable),
-        VMSTATE_VARRAY_UINT32(table, sPAPRTCETable, nb_table, 0, 
vmstate_info_uint64, uint64_t),
+        VMSTATE_VARRAY_UINT32(table, sPAPRTCETable, nb_table,
+                              vmstate_info_uint64, uint64_t),

         VMSTATE_END_OF_LIST()
     },
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index e1c9680..4293377 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -611,7 +611,7 @@ extern const VMStateInfo vmstate_info_bitmap;
 #define VMSTATE_UNUSED(_size)                                         \
     VMSTATE_UNUSED_TEST(NULL, _size)

-#define VMSTATE_VARRAY_UINT32(_field, _state, _field_num, _version, _info, 
_type) \
+#define VMSTATE_VARRAY_UINT32(_field, _state, _field_num, _info, _type) \
     VMSTATE_VARRAY_UINT32_TEST(_field, _state, _field_num, NULL, _info, _type)

 #define VMSTATE_END_OF_LIST()                                         \
-- 
1.9.0