From patchwork Mon Apr 21 14:40:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 341017 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 080B4140078 for ; Tue, 22 Apr 2014 13:15:38 +1000 (EST) Received: from localhost ([::1]:49367 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcFhW-000565-Qs for incoming@patchwork.ozlabs.org; Mon, 21 Apr 2014 11:00:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcFQY-0003v6-Vz for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:42:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcFQS-00040Q-Rk for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:42:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25230) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcFQS-000409-JC for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:42:28 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3LEgRip031272 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 21 Apr 2014 10:42:28 -0400 Received: from trasno.mitica (ovpn-116-41.ams2.redhat.com [10.36.116.41]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s3LEfi6a019220; Mon, 21 Apr 2014 10:42:26 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 21 Apr 2014 16:40:10 +0200 Message-Id: <1398091304-10677-31-git-send-email-quintela@redhat.com> In-Reply-To: <1398091304-10677-1-git-send-email-quintela@redhat.com> References: <1398091304-10677-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 030/124] vmstate: Test for VMSTATE_UINT32_EQUAL X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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 9a64315..c0b823d 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 1e28985..68345a8 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -372,6 +372,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() } }; @@ -380,6 +381,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 */ };