From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX08u-0005wR-VI for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX08o-0008FZ-O8 for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59085) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX08o-0008FQ-ES for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:34 -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 s373MXiK005793 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Apr 2014 23:22:34 -0400 From: Juan Quintela Date: Mon, 7 Apr 2014 05:20:43 +0200 Message-Id: <1396840915-10384-26-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 25/97] vmstate: Test for VMSTATE_UINT32_EQUAL List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Remove unused VMSTATE_UINT32_EQUAL_V. Signed-off-by: Juan Quintela --- include/migration/vmstate.h | 9 +++------ tests/test-vmstate.c | 2 ++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index e6f6a46..267ce4e 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -576,15 +576,12 @@ extern const VMStateInfo vmstate_info_bitmap; #define VMSTATE_UINT16_EQUAL(_f, _s) \ VMSTATE_UINT16_EQUAL_TEST(_f, _s, NULL) +#define VMSTATE_UINT32_EQUAL(_f, _s) \ + VMSTATE_SINGLE_TEST(_f, _s, NULL, 0, vmstate_info_uint32_equal, uint32_t) + #define VMSTATE_INT32_EQUAL(_f, _s) \ VMSTATE_SINGLE(_f, _s, 0, vmstate_info_int32_equal, int32_t) -#define VMSTATE_UINT32_EQUAL_V(_f, _s, _v) \ - VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint32_equal, uint32_t) - -#define VMSTATE_UINT32_EQUAL(_f, _s) \ - VMSTATE_UINT32_EQUAL_V(_f, _s, 0) - #define VMSTATE_UINT64_EQUAL_V(_f, _s, _v) \ VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint64_equal, uint64_t) diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index bd13723..f913b57 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -351,6 +351,7 @@ static const VMStateDescription vmstate_simple_compare = { VMSTATE_UINT16_EQUAL(u16_1, TestSimple), VMSTATE_UINT16_EQUAL_TEST(u16_2, TestSimple, test_false), VMSTATE_UINT16_EQUAL_TEST(u16_3, TestSimple, test_true), + VMSTATE_UINT32_EQUAL(u32_1, TestSimple), VMSTATE_END_OF_LIST() } }; @@ -359,6 +360,7 @@ uint8_t wire_simple_compare[] = { /* u8_1 */ 0x82, /* u16_1 */ 0x02, 0x00, /* u16_3 */ 0x02, 0x00, + /* u32_1 */ 0x00, 0x01, 0x11, 0x70, QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */ }; -- 1.9.0