[Qemu-devel] [PATCH 19/27] vmstate: Test for VMSTATE_UNUSED

[Juan Quintela]

Remove VMSTATE_UNUSED_V and fix only user.

Signed-off-by: Juan Quintela <address@hidden>
---
 hw/intc/ioapic_common.c     |  3 ++-
 include/migration/vmstate.h | 11 ++---------
 tests/test-vmstate.c        |  5 +++++
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c
index d4c0c8e..ae81d3f 100644
--- a/hw/intc/ioapic_common.c
+++ b/hw/intc/ioapic_common.c
@@ -91,7 +91,8 @@ static const VMStateDescription vmstate_ioapic_common = {
     .fields = (VMStateField[]) {
         VMSTATE_UINT8(id, IOAPICCommonState),
         VMSTATE_UINT8(ioregsel, IOAPICCommonState),
-        VMSTATE_UNUSED_V(2, 8), /* to account for qemu-kvm's v2 format */
+        /* to account for qemu-kvm's v2 format */
+        VMSTATE_UNUSED_TEST(vmstate_2_plus, 8),
         VMSTATE_UINT32_TEST(irr, IOAPICCommonState, vmstate_2_plus),
         VMSTATE_UINT64_ARRAY(ioredtbl, IOAPICCommonState, IOAPIC_NUM_PINS),
         VMSTATE_END_OF_LIST()
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index c877b16..16f9865 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -491,10 +491,9 @@ extern const VMStateInfo vmstate_info_bitmap;
     .offset     = offsetof(_state, _field),                          \
 }

-#define VMSTATE_UNUSED_BUFFER(_test, _version, _size) {              \
+#define VMSTATE_UNUSED_TEST(_test, _size) {                          \
     .name         = "unused",                                        \
     .field_exists = (_test),                                         \
-    .version_id   = (_version),                                      \
     .size         = (_size),                                         \
     .info         = &vmstate_info_unused_buffer,                     \
     .flags        = VMS_BUFFER,                                      \
@@ -728,14 +727,8 @@ extern const VMStateInfo vmstate_info_bitmap;
 #define VMSTATE_BUFFER_UNSAFE(_field, _state, _version, _size)        \
     VMSTATE_BUFFER_UNSAFE_INFO(_field, _state, _version, vmstate_info_buffer, 
_size)

-#define VMSTATE_UNUSED_V(_v, _size)                                   \
-    VMSTATE_UNUSED_BUFFER(NULL, _v, _size)
-
 #define VMSTATE_UNUSED(_size)                                         \
-    VMSTATE_UNUSED_V(0, _size)
-
-#define VMSTATE_UNUSED_TEST(_test, _size)                             \
-    VMSTATE_UNUSED_BUFFER(_test, 0, _size)
+    VMSTATE_UNUSED_TEST(NULL, _size)

 #define VMSTATE_END_OF_LIST()                                         \
     {}
diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index 27a3ad4..07aa5e8 100644
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -208,6 +208,7 @@ static const VMStateDescription vmstate_simple_primitive = {
         VMSTATE_INT64(i64_1, TestSimple),
         VMSTATE_INT64(i64_2, TestSimple),
         VMSTATE_FLOAT64(f64, TestSimple),
+        VMSTATE_UNUSED(5),
         VMSTATE_END_OF_LIST()
     }
 };
@@ -240,6 +241,7 @@ uint8_t wire_simple_primitive[] = {
     /* i64_1 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0xf4, 0x7c,
     /* i64_2 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0x47, 0x0b, 0x84,
     /* f64 */   0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18,
+    /* unused */0x00, 0x00, 0x00, 0x00, 0x00,
     QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
 };

@@ -314,6 +316,8 @@ static const VMStateDescription vmstate_simple_test = {
         VMSTATE_UINT32_TEST(u32_2, TestSimple, test_false),
         VMSTATE_UINT64_TEST(u64_1, TestSimple, test_true),
         VMSTATE_UINT64_TEST(u64_2, TestSimple, test_false),
+        VMSTATE_UNUSED_TEST(test_true, 5),
+        VMSTATE_UNUSED_TEST(test_false, 5),
         VMSTATE_END_OF_LIST()
     }
 };
@@ -328,6 +332,7 @@ uint8_t wire_simple_test[] = {
     /* u16_1 */ 0x02, 0x00,
     /* u32_1 */ 0x00, 0x01, 0x11, 0x70,
     /* u64_1 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0xf4, 0x7c,
+    /* unused */0x00, 0x00, 0x00, 0x00, 0x00,
     QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
 };

-- 
1.9.3