From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwTgd-0007rA-P0 for qemu-devel@nongnu.org; Mon, 16 Jun 2014 05:58:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwTgX-0002RT-H7 for qemu-devel@nongnu.org; Mon, 16 Jun 2014 05:58:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48134) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwTgX-0002PL-8L for qemu-devel@nongnu.org; Mon, 16 Jun 2014 05:58:41 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5G9we06007388 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 16 Jun 2014 05:58:40 -0400 From: Juan Quintela Date: Mon, 16 Jun 2014 11:58:07 +0200 Message-Id: <1402912703-28195-12-git-send-email-quintela@redhat.com> In-Reply-To: <1402912703-28195-1-git-send-email-quintela@redhat.com> References: <1402912703-28195-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 11/27] vmstate: Test for VMSTATE_INT16_TEST List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Remove VMSTATES_INT16_V, we are removing versioning, would use only tests. Signed-off-by: Juan Quintela --- 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 a962735..d8febd5 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -540,8 +540,8 @@ extern const VMStateInfo vmstate_info_bitmap; #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_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_INT64_V(_f, _s, _v) \ @@ -562,7 +562,7 @@ extern const VMStateInfo vmstate_info_bitmap; #define VMSTATE_INT8(_f, _s) \ VMSTATE_INT8_TEST(_f, _s, NULL) #define VMSTATE_INT16(_f, _s) \ - VMSTATE_INT16_V(_f, _s, 0) + VMSTATE_INT16_TEST(_f, _s, NULL) #define VMSTATE_INT32(_f, _s) \ VMSTATE_INT32_V(_f, _s, 0) #define VMSTATE_INT64(_f, _s) \ diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index c62e22c..e0b2147 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -291,6 +291,8 @@ static const VMStateDescription vmstate_simple_test = { 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_INT16_TEST(i16_1, TestSimple, test_true), + VMSTATE_INT16_TEST(i16_2, TestSimple, test_false), VMSTATE_END_OF_LIST() } }; @@ -298,6 +300,7 @@ static const VMStateDescription vmstate_simple_test = { uint8_t wire_simple_test[] = { /* b_1 */ 0x01, /* i8_1 */ 0x41, + /* i16_1 */ 0x02, 0x00, QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */ }; @@ -316,6 +319,7 @@ static void test_simple_test(void) FIELD_EQUAL(b_1); FIELD_EQUAL(i8_1); + FIELD_EQUAL(i16_1); } #undef FIELD_EQUAL -- 1.9.3