[Qemu-devel] [PATCH 064/124] vmstate: Remove version_id from VMSTATE_VARRAY_UINT16_UNSAFE

[Juan Quintela]

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

diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c
index 7e09037..8f59509 100644
--- a/hw/nvram/eeprom93xx.c
+++ b/hw/nvram/eeprom93xx.c
@@ -145,7 +145,7 @@ static const VMStateDescription vmstate_eeprom = {
         VMSTATE_UNUSED_TEST(is_old_eeprom_version, 1),
         VMSTATE_UINT16_EQUAL_TEST(size, eeprom_t, is_eeprom_version),
         VMSTATE_UINT16(data, eeprom_t),
-        VMSTATE_VARRAY_UINT16_UNSAFE(contents, eeprom_t, size, 0,
+        VMSTATE_VARRAY_UINT16_UNSAFE(contents, eeprom_t, size,
                                      vmstate_info_uint16, uint16_t),
         VMSTATE_END_OF_LIST()
     }
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index a26eb20..031c117 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -268,9 +268,8 @@ extern const VMStateInfo vmstate_info_bitmap;
     .offset     = vmstate_offset_pointer(_state, _field, _type),     \
 }

-#define VMSTATE_VARRAY_UINT16_UNSAFE(_field, _state, _field_num, _version, 
_info, _type) {\
+#define VMSTATE_VARRAY_UINT16_UNSAFE(_field, _state, _field_num, _info, _type) 
{\
     .name       = (stringify(_field)),                               \
-    .version_id = (_version),                                        \
     .num_offset = vmstate_offset_value(_state, _field_num, uint16_t),\
     .info       = &(_info),                                          \
     .size       = sizeof(_type),                                     \
-- 
1.9.0