[Qemu-devel] [PATCH 12/27] vmstate: Test for VMSTATE_INT32_TEST

[Juan Quintela <quintela@redhat.com>]

Remove VMSTATE_INT32_V, we are removing versioning.
Move all users to use tests.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 hw/input/ps2.c              | 2 +-
 include/migration/vmstate.h | 6 +++---
 target-i386/machine.c       | 4 ++--
 tests/test-vmstate.c        | 4 ++++
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index a466e25..a672ed6 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -700,7 +700,7 @@ static const VMStateDescription vmstate_ps2_keyboard = {
         VMSTATE_STRUCT(common, PS2KbdState, 0, vmstate_ps2_common, PS2State),
         VMSTATE_INT32(scan_enabled, PS2KbdState),
         VMSTATE_INT32(translate, PS2KbdState),
-        VMSTATE_INT32_V(scancode_set, PS2KbdState,3),
+        VMSTATE_INT32_TEST(scancode_set, PS2KbdState, vmstate_3_plus),
         VMSTATE_END_OF_LIST()
     },
     .subsections = (VMStateSubsection []) {
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index d8febd5..e01a399 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -542,8 +542,8 @@ extern const VMStateInfo vmstate_info_bitmap;
     VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_int8, int8_t)
 #define VMSTATE_INT16_TEST(_f, _s, _t)                                \
     VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_int16, int16_t)
-#define VMSTATE_INT32_V(_f, _s, _v)                                   \
-    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_int32, int32_t)
+#define VMSTATE_INT32_TEST(_f, _s, _t)                                \
+    VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_int32, int32_t)
 #define VMSTATE_INT64_V(_f, _s, _v)                                   \
     VMSTATE_SINGLE(_f, _s, _v, vmstate_info_int64, int64_t)

@@ -564,7 +564,7 @@ extern const VMStateInfo vmstate_info_bitmap;
 #define VMSTATE_INT16(_f, _s)                                         \
     VMSTATE_INT16_TEST(_f, _s, NULL)
 #define VMSTATE_INT32(_f, _s)                                         \
-    VMSTATE_INT32_V(_f, _s, 0)
+    VMSTATE_INT32_TEST(_f, _s, NULL)
 #define VMSTATE_INT64(_f, _s)                                         \
     VMSTATE_INT64_V(_f, _s, 0)

diff --git a/target-i386/machine.c b/target-i386/machine.c
index a684d75..7e80b52 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -679,10 +679,10 @@ const VMStateDescription vmstate_x86_cpu = {
         VMSTATE_UINT64_V(env.mtrr_deftype, X86CPU, 8),
         VMSTATE_MTRR_VARS(env.mtrr_var, X86CPU, 8, 8),
         /* KVM-related states */
-        VMSTATE_INT32_V(env.interrupt_injected, X86CPU, 9),
+        VMSTATE_INT32_TEST(env.interrupt_injected, X86CPU, vmstate_9_plus),
         VMSTATE_UINT32_V(env.mp_state, X86CPU, 9),
         VMSTATE_UINT64_V(env.tsc, X86CPU, 9),
-        VMSTATE_INT32_V(env.exception_injected, X86CPU, 11),
+        VMSTATE_INT32_TEST(env.exception_injected, X86CPU, vmstate_11_plus),
         VMSTATE_UINT8_V(env.soft_interrupt, X86CPU, 11),
         VMSTATE_UINT8_V(env.nmi_injected, X86CPU, 11),
         VMSTATE_UINT8_V(env.nmi_pending, X86CPU, 11),
diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index e0b2147..6f47f0c 100644
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -293,6 +293,8 @@ static const VMStateDescription vmstate_simple_test = {
         VMSTATE_INT8_TEST(i8_2, TestSimple, test_false),
         VMSTATE_INT16_TEST(i16_1, TestSimple, test_true),
         VMSTATE_INT16_TEST(i16_2, TestSimple, test_false),
+        VMSTATE_INT32_TEST(i32_1, TestSimple, test_true),
+        VMSTATE_INT32_TEST(i32_2, TestSimple, test_false),
         VMSTATE_END_OF_LIST()
     }
 };
@@ -301,6 +303,7 @@ uint8_t wire_simple_test[] = {
     /* b_1 */   0x01,
     /* i8_1 */  0x41,
     /* i16_1 */ 0x02, 0x00,
+    /* i32_1 */ 0x00, 0x01, 0x11, 0x70,
     QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
 };

@@ -320,6 +323,7 @@ static void test_simple_test(void)
     FIELD_EQUAL(b_1);
     FIELD_EQUAL(i8_1);
     FIELD_EQUAL(i16_1);
+    FIELD_EQUAL(i32_1);
 }
 #undef FIELD_EQUAL

-- 
1.9.3