[Qemu-devel] [PATCH 068/124] vmstate: Remove version paramenter from VMSTATE_ARRAY_OF_POINTER_TO_STRUCT

[Juan Quintela]

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

diff --git a/include/hw/ptimer.h b/include/hw/ptimer.h
index ef852bf..57a65e6 100644
--- a/include/hw/ptimer.h
+++ b/include/hw/ptimer.h
@@ -31,7 +31,7 @@ extern const VMStateDescription vmstate_ptimer;
     VMSTATE_STRUCT_POINTER(_field, _state, vmstate_ptimer, ptimer_state)

 #define VMSTATE_PTIMER_ARRAY(_f, _s, _n)                                \
-    VMSTATE_ARRAY_OF_POINTER_TO_STRUCT(_f, _s, _n, 0,                   \
+    VMSTATE_ARRAY_OF_POINTER_TO_STRUCT(_f, _s, _n,                      \
                                        vmstate_ptimer, ptimer_state)

 #endif
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index a9a8133..f5687b7 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -305,12 +305,11 @@ extern const VMStateInfo vmstate_info_bitmap;
     .offset     = vmstate_offset_array(_state, _field, _type, _num), \
 }

-#define VMSTATE_ARRAY_OF_POINTER_TO_STRUCT(_f, _s, _n, _v, _vmsd, _type) { \
+#define VMSTATE_ARRAY_OF_POINTER_TO_STRUCT(_f, _s, _n, _vmsd, _type) { \
     .name       = (stringify(_f)),                                   \
-    .version_id = (_v),                                              \
     .num        = (_n),                                              \
     .vmsd       = &(_vmsd),                                          \
-    .size       = sizeof(_type *),                                    \
+    .size       = sizeof(_type *),                                   \
     .flags      = VMS_ARRAY|VMS_STRUCT|VMS_ARRAY_OF_POINTER,         \
     .offset     = vmstate_offset_array(_s, _f, _type*, _n),          \
 }
-- 
1.9.0