[Qemu-devel] [PATCH 94/97] vmstate: ename VMSTATE_PARTIAL_VBUFFER to VMSTATE_VBUFFER_INT32

[Juan Quintela]

This is more consistent with VMSTATE_VBUFFER_UINT32 that also exist

Signed-off-by: Juan Quintela <address@hidden>
---
 hw/block/onenand.c          | 2 +-
 include/migration/vmstate.h | 7 +------
 tests/test-vmstate.c        | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/hw/block/onenand.c b/hw/block/onenand.c
index 87fbf00..6a97925 100644
--- a/hw/block/onenand.c
+++ b/hw/block/onenand.c
@@ -185,7 +185,7 @@ static const VMStateDescription vmstate_onenand = {
         VMSTATE_UINT16(intstatus, OneNANDState),
         VMSTATE_UINT16(wpstatus, OneNANDState),
         VMSTATE_INT32(secs_cur, OneNANDState),
-        VMSTATE_PARTIAL_VBUFFER(blockwp, OneNANDState, blocks),
+        VMSTATE_VBUFFER_INT32(blockwp, OneNANDState, blocks),
         VMSTATE_UINT8(ecc.cp, OneNANDState),
         VMSTATE_UINT16_ARRAY(ecc.lp, OneNANDState, 2),
         VMSTATE_UINT16(ecc.count, OneNANDState),
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 6c7c751..6c503d9 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -431,14 +431,12 @@ extern const VMStateInfo vmstate_info_bitmap;
     .offset       = vmstate_offset_buffer(_state, _field) + _start,  \
 }

-#define VMSTATE_VBUFFER(_field, _state, _test, _start, _field_size) { \
+#define VMSTATE_VBUFFER_INT32(_field, _state, _field_size) { \
     .name         = (stringify(_field)),                             \
-    .field_exists = (_test),                                         \
     .size_offset  = vmstate_offset_value(_state, _field_size, int32_t),\
     .info         = &vmstate_info_buffer,                            \
     .flags        = VMS_VBUFFER|VMS_POINTER,                         \
     .offset       = offsetof(_state, _field),                        \
-    .start        = (_start),                                        \
 }

 #define VMSTATE_VBUFFER_UINT32(_field, _state, _field_size) { \
@@ -638,9 +636,6 @@ extern const VMStateInfo vmstate_info_bitmap;
 #define VMSTATE_BUFFER_START_MIDDLE(_f, _s, _start) \
     VMSTATE_STATIC_BUFFER(_f, _s, NULL, _start, sizeof(typeof_field(_s, _f)))

-#define VMSTATE_PARTIAL_VBUFFER(_f, _s, _size)                        \
-    VMSTATE_VBUFFER(_f, _s, NULL, 0, _size)
-
 #define VMSTATE_BUFFER_TEST(_f, _s, _test)                            \
     VMSTATE_STATIC_BUFFER(_f, _s, _test, 0, sizeof(typeof_field(_s, _f)))

diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index 6d8545c..ea24f26 100644
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -1120,7 +1120,7 @@ static const VMStateDescription vmstate_vbuffer_simple = {
     .minimum_version_id_old = 1,
     .fields = (VMStateField[]) {
         VMSTATE_INT32(size, TestVBuffer),
-        VMSTATE_PARTIAL_VBUFFER(buffer, TestVBuffer, size),
+        VMSTATE_VBUFFER_INT32(buffer, TestVBuffer, size),
         VMSTATE_END_OF_LIST()
     }
 };
-- 
1.9.0