[Qemu-devel] [PATCH 30/97] vmstate: Move VMSTATE_TIMER_V to VMSTATE_TIMER_TEST

[Juan Quintela]

No test created, because it is basically imposible to create a timer by hand :-(

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

diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index 8446d48..f3dc2fe 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -733,7 +733,7 @@ static const VMStateDescription vmstate_rtc = {
         VMSTATE_UINT64_TEST(base_rtc, RTCState, vmstate_3_plus),
         VMSTATE_UINT64_TEST(last_update, RTCState, vmstate_3_plus),
         VMSTATE_INT64_TEST(offset, RTCState, vmstate_3_plus),
-        VMSTATE_TIMER_V(update_timer, RTCState, 3),
+        VMSTATE_TIMER_TEST(update_timer, RTCState, vmstate_3_plus),
         VMSTATE_UINT64_TEST(next_alarm_time, RTCState, vmstate_3_plus),
         VMSTATE_END_OF_LIST()
     }
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index f6bec36..956a358 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -594,13 +594,10 @@ extern const VMStateInfo vmstate_info_bitmap;
 #define VMSTATE_TIMER_TEST(_f, _s, _test)                             \
     VMSTATE_POINTER_TEST(_f, _s, _test, vmstate_info_timer, QEMUTimer *)

-#define VMSTATE_TIMER_V(_f, _s, _v)                                   \
-    VMSTATE_POINTER(_f, _s, _v, vmstate_info_timer, QEMUTimer *)
-
 #define VMSTATE_TIMER(_f, _s)                                         \
-    VMSTATE_TIMER_V(_f, _s, 0)
+    VMSTATE_TIMER_TEST(_f, _s, NULL)

-#define VMSTATE_TIMER_ARRAY(_f, _s, _n)                              \
+#define VMSTATE_TIMER_ARRAY(_f, _s, _n)                               \
     VMSTATE_ARRAY_OF_POINTER(_f, _s, _n, 0, vmstate_info_timer, QEMUTimer *)

 #define VMSTATE_BOOL_ARRAY_V(_f, _s, _n, _v)                         \
-- 
1.9.0