[Qemu-devel] [PATCH 060/124] vmstate: Remove version_id from VMSTATE_VBUFFER

[Juan Quintela]

None of its two users use it.

Signed-off-by: Juan Quintela <address@hidden>
---
 include/migration/vmstate.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index e4839a2..dfb59e2 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -412,9 +412,8 @@ extern const VMStateInfo vmstate_info_bitmap;
     .start        = (_start),                                        \
 }

-#define VMSTATE_VBUFFER(_field, _state, _version, _test, _start, _field_size) 
{ \
+#define VMSTATE_VBUFFER(_field, _state, _test, _start, _field_size) { \
     .name         = (stringify(_field)),                             \
-    .version_id   = (_version),                                      \
     .field_exists = (_test),                                         \
     .size_offset  = vmstate_offset_value(_state, _field_size, int32_t),\
     .info         = &vmstate_info_buffer,                            \
@@ -627,13 +626,13 @@ extern const VMStateInfo vmstate_info_bitmap;
     VMSTATE_STATIC_BUFFER(_f, _s, 0, NULL, _start, sizeof(typeof_field(_s, 
_f)))

 #define VMSTATE_PARTIAL_VBUFFER(_f, _s, _size)                        \
-    VMSTATE_VBUFFER(_f, _s, 0, NULL, 0, _size)
+    VMSTATE_VBUFFER(_f, _s, NULL, 0, _size)

 #define VMSTATE_PARTIAL_VBUFFER_UINT32(_f, _s, _size)                        \
     VMSTATE_VBUFFER_UINT32(_f, _s, 0, NULL, 0, _size)

 #define VMSTATE_SUB_VBUFFER(_f, _s, _start, _size)                    \
-    VMSTATE_VBUFFER(_f, _s, 0, NULL, _start, _size)
+    VMSTATE_VBUFFER(_f, _s, NULL, _start, _size)

 #define VMSTATE_BUFFER_TEST(_f, _s, _test)                            \
     VMSTATE_STATIC_BUFFER(_f, _s, 0, _test, 0, sizeof(typeof_field(_s, _f)))
-- 
1.9.0