From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX08h-0005Xn-Tx for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX08a-0008C7-Uz for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59639) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX08a-0008Bw-Ns for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:20 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s373MKPK027007 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Apr 2014 23:22:20 -0400 From: Juan Quintela Date: Mon, 7 Apr 2014 05:20:33 +0200 Message-Id: <1396840915-10384-16-git-send-email-quintela@redhat.com> In-Reply-To: <1396840915-10384-1-git-send-email-quintela@redhat.com> References: <1396840915-10384-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 15/97] vmstate: test for VMSTATE_INT64_TEST List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Remove VMSTATE_INT64_V, we are removing versioning. Move all users to VMSTATE_INT64_TEST. Signed-off-by: Juan Quintela --- 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 c510052..83aa302 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 1822af2..8342749 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 9b1166b..5590e18 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -457,7 +457,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 85356be..ba8b44d 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -535,8 +535,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) @@ -557,7 +557,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 75e5600..b8d1309 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -249,6 +249,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() } }; @@ -258,6 +260,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 */ }; @@ -305,6 +308,7 @@ static void test_simple_test(void) FIELD_ASSERT(i8_1); FIELD_ASSERT(i16_1); FIELD_ASSERT(i32_1); + FIELD_ASSERT(i64_1); qemu_fclose(loading); } -- 1.9.0