From patchwork Mon Apr 7 03:20:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 337376 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 305FD1400CF for ; Mon, 7 Apr 2014 15:35:40 +1000 (EST) Received: from localhost ([::1]:60235 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX0Pp-0003yi-2L for incoming@patchwork.ozlabs.org; Sun, 06 Apr 2014 23:40:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX090-00067r-IA for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX08u-0008Hp-9m for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29587) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX08u-0008Hk-01 for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:40 -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 s373MdGV002387 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Apr 2014 23:22:39 -0400 Received: from trasno.mitica (ovpn-116-27.ams2.redhat.com [10.36.116.27]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s373LuWv020053; Sun, 6 Apr 2014 23:22:38 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 7 Apr 2014 05:20:47 +0200 Message-Id: <1396840915-10384-30-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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 29/97] vmstate: s/VMSTATE_INT32_LE/VMSTATE_INT32_POSITIVE_LE/ 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 From: "Michael S. Tsirkin" As the macro verifies the value is positive, rename it to make the function clearer. Signed-off-by: Michael S. Tsirkin Signed-off-by: Juan Quintela --- hw/pci/pci.c | 4 ++-- include/migration/vmstate.h | 3 +-- target-arm/machine.c | 2 +- tests/test-vmstate.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index d4375b6..2ba6b30 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -473,7 +473,7 @@ const VMStateDescription vmstate_pci_device = { .version_id = 2, .minimum_version_id = 1, .fields = (VMStateField[]) { - VMSTATE_INT32_LE(version_id, PCIDevice), + VMSTATE_INT32_POSITIVE_LE(version_id, PCIDevice), VMSTATE_BUFFER_UNSAFE_INFO(config, PCIDevice, 0, vmstate_info_pci_config, PCI_CONFIG_SPACE_SIZE), @@ -489,7 +489,7 @@ const VMStateDescription vmstate_pcie_device = { .version_id = 2, .minimum_version_id = 1, .fields = (VMStateField[]) { - VMSTATE_INT32_LE(version_id, PCIDevice), + VMSTATE_INT32_POSITIVE_LE(version_id, PCIDevice), VMSTATE_BUFFER_UNSAFE_INFO(config, PCIDevice, 0, vmstate_info_pci_config, PCIE_CONFIG_SPACE_SIZE), diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 8707c4f..f6bec36 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -585,10 +585,9 @@ extern const VMStateInfo vmstate_info_bitmap; #define VMSTATE_INT32_EQUAL(_f, _s) \ VMSTATE_SINGLE_TEST(_f, _s, NULL, 0, vmstate_info_int32_equal, int32_t) -#define VMSTATE_INT32_LE(_f, _s) \ +#define VMSTATE_INT32_POSITIVE_LE(_f, _s) \ VMSTATE_SINGLE_TEST(_f, _s, NULL, 0, vmstate_info_int32_le, int32_t) - #define VMSTATE_FLOAT64(_f, _s) \ VMSTATE_SINGLE_TEST(_f, _s, NULL, 0, vmstate_info_float64, float64) diff --git a/target-arm/machine.c b/target-arm/machine.c index ee67b67..3f4fd42 100644 --- a/target-arm/machine.c +++ b/target-arm/machine.c @@ -241,7 +241,7 @@ const VMStateDescription vmstate_arm_cpu = { /* The length-check must come before the arrays to avoid * incoming data possibly overflowing the array. */ - VMSTATE_INT32_LE(cpreg_vmstate_array_len, ARMCPU), + VMSTATE_INT32_POSITIVE_LE(cpreg_vmstate_array_len, ARMCPU), VMSTATE_VARRAY_INT32(cpreg_vmstate_indexes, ARMCPU, cpreg_vmstate_array_len, 0, vmstate_info_uint64, uint64_t), diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index d52f722..846ed39 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -354,7 +354,7 @@ static const VMStateDescription vmstate_simple_compare = { VMSTATE_UINT32_EQUAL(u32_1, TestSimple), VMSTATE_UINT64_EQUAL(u64_1, TestSimple), VMSTATE_INT32_EQUAL(i32_2, TestSimple), - VMSTATE_INT32_LE(i32_1, TestSimple), + VMSTATE_INT32_POSITIVE_LE(i32_1, TestSimple), VMSTATE_END_OF_LIST() } };