[Qemu-devel] [PATCH 13/27] vmstate: test for VMSTATE_INT64_TEST

[Juan Quintela]

Remove VMSTATE_INT64_V, we are removing versioning.
Move all users to VMSTATE_INT64_TEST.

Signed-off-by: Juan Quintela <address@hidden>
---
 cpus.c                      | 2 +-
 hw/timer/mc146818rtc.c      | 2 +-
 hw/usb/hcd-uhci.c           | 2 +-
 include/migration/vmstate.h | 6 +++---
 tests/test-vmstate.c        | 4 ++++
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cpus.c b/cpus.c
index dd7ac13..4f2ea64 100644
--- a/cpus.c
+++ b/cpus.c
@@ -433,7 +433,7 @@ static const VMStateDescription vmstate_timers = {
     .fields = (VMStateField[]) {
         VMSTATE_INT64(cpu_ticks_offset, TimersState),
         VMSTATE_INT64(dummy, TimersState),
-        VMSTATE_INT64_V(cpu_clock_offset, TimersState, 2),
+        VMSTATE_INT64_TEST(cpu_clock_offset, TimersState, vmstate_2_plus),
         VMSTATE_END_OF_LIST()
     }
 };
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index 1201f90..5a2de40 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -732,7 +732,7 @@ static const VMStateDescription vmstate_rtc = {
         VMSTATE_UINT32_V(period, RTCState, 2),
         VMSTATE_UINT64_V(base_rtc, RTCState, 3),
         VMSTATE_UINT64_V(last_update, RTCState, 3),
-        VMSTATE_INT64_V(offset, RTCState, 3),
+        VMSTATE_INT64_TEST(offset, RTCState, vmstate_3_plus),
         VMSTATE_TIMER_V(update_timer, RTCState, 3),
         VMSTATE_UINT64_V(next_alarm_time, RTCState, 3),
         VMSTATE_END_OF_LIST()
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index c3bf72c..77af60b 100644
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -423,7 +423,7 @@ static const VMStateDescription vmstate_uhci = {
         VMSTATE_UINT8(sof_timing, UHCIState),
         VMSTATE_UINT8(status2, UHCIState),
         VMSTATE_TIMER(frame_timer, UHCIState),
-        VMSTATE_INT64_V(expire_time, UHCIState, 2),
+        VMSTATE_INT64_TEST(expire_time, UHCIState, vmstate_3_plus),
         VMSTATE_UINT32_V(pending_int_mask, UHCIState, 3),
         VMSTATE_END_OF_LIST()
     }
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index e01a399..f37d033 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -544,8 +544,8 @@ extern const VMStateInfo vmstate_info_bitmap;
     VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_int16, int16_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)
+#define VMSTATE_INT64_TEST(_f, _s, _t)                                \
+    VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_int64, int64_t)

 #define VMSTATE_UINT8_V(_f, _s, _v)                                   \
     VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint8, uint8_t)
@@ -566,7 +566,7 @@ extern const VMStateInfo vmstate_info_bitmap;
 #define VMSTATE_INT32(_f, _s)                                         \
     VMSTATE_INT32_TEST(_f, _s, NULL)
 #define VMSTATE_INT64(_f, _s)                                         \
-    VMSTATE_INT64_V(_f, _s, 0)
+    VMSTATE_INT64_TEST(_f, _s, NULL)

 #define VMSTATE_UINT8(_f, _s)                                         \
     VMSTATE_UINT8_V(_f, _s, 0)
diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index 6f47f0c..1302aee 100644
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -295,6 +295,8 @@ static const VMStateDescription vmstate_simple_test = {
         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_INT64_TEST(i64_1, TestSimple, test_true),
+        VMSTATE_INT64_TEST(i64_2, TestSimple, test_false),
         VMSTATE_END_OF_LIST()
     }
 };
@@ -304,6 +306,7 @@ uint8_t wire_simple_test[] = {
     /* i8_1 */  0x41,
     /* i16_1 */ 0x02, 0x00,
     /* i32_1 */ 0x00, 0x01, 0x11, 0x70,
+    /* i64_1 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0xf4, 0x7c,
     QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
 };

@@ -324,6 +327,7 @@ static void test_simple_test(void)
     FIELD_EQUAL(i8_1);
     FIELD_EQUAL(i16_1);
     FIELD_EQUAL(i32_1);
+    FIELD_EQUAL(i64_1);
 }
 #undef FIELD_EQUAL

-- 
1.9.3