[Qemu-devel] [PATCH 12/97] vmstate: Test for VMSTATE_INT8_TEST

[Juan Quintela <quintela@redhat.com>]

Remove VMSTATE_INT8_V, we are removing versioning, would use only tests.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 include/migration/vmstate.h | 6 +++---
 tests/test-vmstate.c        | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 184d564..70c89b3 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -529,8 +529,8 @@ extern const VMStateInfo vmstate_info_bitmap;
 #define VMSTATE_BOOL_TEST(_f, _s, _t)                                 \
     VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_bool, bool)

-#define VMSTATE_INT8_V(_f, _s, _v)                                    \
-    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_int8, int8_t)
+#define VMSTATE_INT8_TEST(_f, _s, _t)                                 \
+    VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_int8, int8_t)
 #define VMSTATE_INT16_V(_f, _s, _v)                                   \
     VMSTATE_SINGLE(_f, _s, _v, vmstate_info_int16, int16_t)
 #define VMSTATE_INT32_V(_f, _s, _v)                                   \
@@ -551,7 +551,7 @@ extern const VMStateInfo vmstate_info_bitmap;
     VMSTATE_BOOL_TEST(_f, _s, NULL)

 #define VMSTATE_INT8(_f, _s)                                          \
-    VMSTATE_INT8_V(_f, _s, 0)
+    VMSTATE_INT8_TEST(_f, _s, NULL)
 #define VMSTATE_INT16(_f, _s)                                         \
     VMSTATE_INT16_V(_f, _s, 0)
 #define VMSTATE_INT32(_f, _s)                                         \
diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index 7ca32af..476cef8 100644
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -243,12 +243,15 @@ static const VMStateDescription vmstate_simple_test = {
     .fields = (VMStateField[]) {
         VMSTATE_BOOL_TEST(b_1, TestSimple, test_true),
         VMSTATE_BOOL_TEST(b_2, TestSimple, test_false),
+        VMSTATE_INT8_TEST(i8_1, TestSimple, test_true),
+        VMSTATE_INT8_TEST(i8_2, TestSimple, test_false),
         VMSTATE_END_OF_LIST()
     }
 };

 uint8_t wire_simple_test[] = {
     /* b_1 */   0x01,
+    /* i8_1 */  0x41,
     QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
 };

@@ -293,6 +296,7 @@ static void test_simple_test(void)
     g_assert(!qemu_file_get_error(loading));

     FIELD_ASSERT(b_1);
+    FIELD_ASSERT(i8_1);

     qemu_fclose(loading);
 }
-- 
1.9.0