65 lines
2.8 KiB
Diff
65 lines
2.8 KiB
Diff
From: "Michael S. Tsirkin" <mst@redhat.com>
|
|
Date: Thu, 3 Apr 2014 19:52:21 +0300
|
|
Subject: [PATCH] vmstate: s/VMSTATE_INT32_LE/VMSTATE_INT32_POSITIVE_LE/
|
|
|
|
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>
|
|
(cherry picked from commit 3476436a44c29725efef0cabf5b3ea4e70054d57)
|
|
---
|
|
hw/pci/pci.c | 4 ++--
|
|
include/migration/vmstate.h | 2 +-
|
|
target-arm/machine.c | 2 +-
|
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
|
|
index 129cdb7..0f1d167 100644
|
|
--- a/hw/pci/pci.c
|
|
+++ b/hw/pci/pci.c
|
|
@@ -471,7 +471,7 @@ const VMStateDescription vmstate_pci_device = {
|
|
.minimum_version_id = 1,
|
|
.minimum_version_id_old = 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),
|
|
@@ -488,7 +488,7 @@ const VMStateDescription vmstate_pcie_device = {
|
|
.minimum_version_id = 1,
|
|
.minimum_version_id_old = 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 d5a63ce..7ffb7cd 100644
|
|
--- a/include/migration/vmstate.h
|
|
+++ b/include/migration/vmstate.h
|
|
@@ -578,7 +578,7 @@ extern const VMStateInfo vmstate_info_bitmap;
|
|
#define VMSTATE_UINT64_EQUAL(_f, _s) \
|
|
VMSTATE_UINT64_EQUAL_V(_f, _s, 0)
|
|
|
|
-#define VMSTATE_INT32_LE(_f, _s) \
|
|
+#define VMSTATE_INT32_POSITIVE_LE(_f, _s) \
|
|
VMSTATE_SINGLE(_f, _s, 0, vmstate_info_int32_le, int32_t)
|
|
|
|
#define VMSTATE_UINT8_TEST(_f, _s, _t) \
|
|
diff --git a/target-arm/machine.c b/target-arm/machine.c
|
|
index 6d4c2d4..f3041af 100644
|
|
--- a/target-arm/machine.c
|
|
+++ b/target-arm/machine.c
|
|
@@ -246,7 +246,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),
|