[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 74/97] vmstate: Remove version parameter from VMSTAT
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 74/97] vmstate: Remove version parameter from VMSTATE_STRUCT_TEST |
Date: |
Mon, 7 Apr 2014 05:21:32 +0200 |
As we haven't yet moved everything that uses VMSTATE_STRUCT_TEST we create a
temporary VMSTATE_STRUCT_INFO. This would allows us to not having to move
fields to VMSTATE_STRUCT_TEST and then remove the version parameter.
Signed-off-by: Juan Quintela <address@hidden>
---
hw/acpi/piix4.c | 2 +-
include/migration/vmstate.h | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 252bbf2..091dca3 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -270,7 +270,7 @@ static const VMStateDescription vmstate_acpi = {
acpi_pci_hotplug.acpi_pcihp_pci_status[ACPI_PCIHP_BSEL_DEFAULT],
PIIX4PMState,
vmstate_test_no_use_acpi_pci_hotplug,
- 2, vmstate_pci_status,
+ vmstate_pci_status,
struct AcpiPciHpPciStatus),
VMSTATE_PCI_HOTPLUG(acpi_pci_hotplug, PIIX4PMState,
vmstate_test_use_acpi_pci_hotplug),
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 7bbac50..c6590cb 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -276,7 +276,7 @@ extern const VMStateInfo vmstate_info_bitmap;
.offset = offsetof(_state, _field), \
}
-#define VMSTATE_STRUCT_TEST(_field, _state, _test, _version, _vmsd, _type) { \
+#define VMSTATE_STRUCT_INFO(_field, _state, _test, _version, _vmsd, _type) { \
.name = (stringify(_field)), \
.version_id = (_version), \
.field_exists = (_test), \
@@ -447,8 +447,11 @@ extern const VMStateInfo vmstate_info_bitmap;
_v : version
*/
+#define VMSTATE_STRUCT_TEST(_field, _state, _test, _vmsd, _type) \
+ VMSTATE_STRUCT_INFO(_field, _state, _test, 0, _vmsd, _type)
+
#define VMSTATE_STRUCT(_field, _state, _version, _vmsd, _type) \
- VMSTATE_STRUCT_TEST(_field, _state, NULL, _version, _vmsd, _type)
+ VMSTATE_STRUCT_INFO(_field, _state, NULL, _version, _vmsd, _type)
#define VMSTATE_STRUCT_POINTER(_field, _state, _vmsd, _type) \
VMSTATE_STRUCT_POINTER_TEST(_field, _state, NULL, _vmsd, _type)
--
1.9.0
- [Qemu-devel] [PATCH 65/97] vmstate: Remove version parameter from VMSTATE_STATIC_BUFFER, (continued)
- [Qemu-devel] [PATCH 65/97] vmstate: Remove version parameter from VMSTATE_STATIC_BUFFER, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 64/97] vmstate: Remove VMSTATE_BUFFER_MULTIPLY, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 66/97] vmstate: Remove version field from VMSTATE_STRUCT_VARRAY_UINT32, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 67/97] vmstate: Move all users of versioning of VMSTATE_STRUCT_ARRAY to _TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 68/97] vmstate: Remove version paramenter from VMSTATE_STRUCT_ARRAY, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 69/97] vmstate: Remove version parameter from VMSTATE_STRUCT_ARRAY_TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 70/97] vmstate: Remove unused version parameter from VMSTATE_STRUCT_VARRAY_INT32, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 71/97] vmstate: Remove unused version parameter from VMSTATE_STRUCT_VARRAY_UINT8, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 72/97] vmstate: Introduce VMSTATE_VARRAY_UINT32_TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 73/97] vmstate: Remove version parameter from VMSTATE_VARRAY_UINT32, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 74/97] vmstate: Remove version parameter from VMSTATE_STRUCT_TEST,
Juan Quintela <=
- [Qemu-devel] [PATCH 75/97] vmstate: Move all users of versioning to VMSTATE_STRUCT_TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 76/97] vmstate: Remove version from all VMSTATE_STRUCT calls, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 77/97] vmstate: Create VMSTATE_VARRAY macro, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 78/97] vmstate: Create VMSTATE_POINTER_UNSAFE, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 79/97] vmstate: Create VMSTATE_OPENCODED_UNSAFE, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 80/97] vmstate: Create VMSTATE_SYNTHETIC, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 81/97] vmstate: version_id is gone from fields, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 83/97] vmstate: Test for VMSTATE_UINT8_SUB_ARRAY, Juan Quintela, 2014/04/06