[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 053/124] vmstate: Port last 3 users of VMSTATE_ARRAY
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 053/124] vmstate: Port last 3 users of VMSTATE_ARRAY to VMSTATE_ARRAY_TEST |
Date: |
Mon, 21 Apr 2014 16:40:33 +0200 |
And then remove VMSTATE_ARRAY.
Signed-off-by: Juan Quintela <address@hidden>
---
hw/net/vmxnet3.c | 13 +++++++------
include/migration/vmstate.h | 10 ----------
2 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index d8e8d59..1faf58d 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -2457,14 +2457,15 @@ static const VMStateDescription vmstate_vmxnet3 = {
VMSTATE_UINT64(drv_shmem, VMXNET3State),
VMSTATE_UINT64(temp_shared_guest_driver_memory, VMXNET3State),
- VMSTATE_ARRAY(txq_descr, VMXNET3State,
- VMXNET3_DEVICE_MAX_TX_QUEUES, 0, txq_descr_info,
+ VMSTATE_ARRAY_TEST(txq_descr, VMXNET3State,
+ VMXNET3_DEVICE_MAX_TX_QUEUES, NULL, txq_descr_info,
Vmxnet3TxqDescr),
- VMSTATE_ARRAY(rxq_descr, VMXNET3State,
- VMXNET3_DEVICE_MAX_RX_QUEUES, 0, rxq_descr_info,
+ VMSTATE_ARRAY_TEST(rxq_descr, VMXNET3State,
+ VMXNET3_DEVICE_MAX_RX_QUEUES, NULL, rxq_descr_info,
Vmxnet3RxqDescr),
- VMSTATE_ARRAY(interrupt_states, VMXNET3State, VMXNET3_MAX_INTRS,
- 0, int_state_info, Vmxnet3IntState),
+ VMSTATE_ARRAY_TEST(interrupt_states, VMXNET3State,
+ VMXNET3_MAX_INTRS, NULL, int_state_info,
+ Vmxnet3IntState),
VMSTATE_END_OF_LIST()
},
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index f0c99d9..60b67dc 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -221,16 +221,6 @@ extern const VMStateInfo vmstate_info_bitmap;
.offset = vmstate_offset_value(_state, _field, _type), \
}
-#define VMSTATE_ARRAY(_field, _state, _num, _version, _info, _type) {\
- .name = (stringify(_field)), \
- .version_id = (_version), \
- .num = (_num), \
- .info = &(_info), \
- .size = sizeof(_type), \
- .flags = VMS_ARRAY, \
- .offset = vmstate_offset_array(_state, _field, _type, _num), \
-}
-
#define VMSTATE_2DARRAY(_field, _state, _n1, _n2, _version, _info, _type) { \
.name = (stringify(_field)), \
.version_id = (_version), \
--
1.9.0
- [Qemu-devel] [PATCH 042/124] vmstate: Test for VMSTATE_INT32_ARRAY{_TEST}, (continued)
- [Qemu-devel] [PATCH 042/124] vmstate: Test for VMSTATE_INT32_ARRAY{_TEST}, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 045/124] vmstate: Test for VMSTATE_UINT8_2DARRAY, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 043/124] vmstate: Test for VMSTATE_INT64_ARRAY, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 046/124] vmstate: Test for VMSTATE_UINT16_2DARRAY., Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 044/124] vmstate: Test for VMSTATE_FLOAT64_ARRAY, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 047/124] vmstate: Test for VMSTATE_UINT32_2DARRAY, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 048/124] vmstate: Remove unused VMSTATE_BUFFER_V, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 049/124] vmstate: Remove version from VMSTATE_BUFFER_UNSAFE, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 050/124] vmstate: Remove unused version fields from ARM, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 051/124] vmstate: All ptimers users were at least at version 1 or more, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 053/124] vmstate: Port last 3 users of VMSTATE_ARRAY to VMSTATE_ARRAY_TEST,
Juan Quintela <=
- [Qemu-devel] [PATCH 052/124] vmstate: Remove version from all variants of VMSTATE_STRUCT_POINTER*, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 054/124] vmstate: Port last user of VMSTATE_SINGLE to VMSTATE_SINGLE_TEST, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 055/124] vmstate: Remove unused VMSTATE_POINTER, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 057/124] vmstate: Move VMSTATE_2DARRAY to use _test, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 056/124] vmstate: Rename VMSTATE_SINGLE_TEST to VMSTATE_SINGLE, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 058/124] vmstate: Rename VMSTATE_POINTER_TEST without _TEST, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 059/124] vmstate: Rename VMSTATE_ARRAY_TEST to VMSTATE_ARRAY, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 061/124] vmstate: Remove version_id fields that were not used, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 060/124] vmstate: Remove version_id from VMSTATE_VBUFFER, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 062/124] vmstate: Remove version_id from VMSTATE_SUB_ARRAY, Juan Quintela, 2014/04/21