diff mbox

[29/97] vmstate: s/VMSTATE_INT32_LE/VMSTATE_INT32_POSITIVE_LE/

Message ID 1396840915-10384-30-git-send-email-quintela@redhat.com
State New
Headers show

Commit Message

Juan Quintela April 7, 2014, 3:20 a.m. UTC 
From: "Michael S. Tsirkin" <mst@redhat.com>

As the macro verifies the value is positive, rename it
to make the function clearer.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 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 mbox

Patch

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()
     }
 };