[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/10] vmstate: move VMSTATE_PCIE_AER_ERRS to hw/hw.
From: |
Dmitry Eremin-Solenikov |
Subject: |
[Qemu-devel] [PATCH 07/10] vmstate: move VMSTATE_PCIE_AER_ERRS to hw/hw.h |
Date: |
Sun, 20 Feb 2011 16:50:35 +0300 |
VMSTATE_PCIE_AER_ERRS is indeed useful for other emulation drivers.
Move it to hw/hw.h under the name of VMSTATE_STRUCT_VARRAY_POINTER_UINT16.
Also add VMSTATE_STRUCT_VARRAY_POINTER_INT32 which is more or less
the same as _UINT16 macro, except the fact it uses int32_t internally.
Signed-off-by: Dmitry Eremin-Solenikov <address@hidden>
---
hw/hw.h | 21 +++++++++++++++++++++
hw/pcie_aer.c | 12 +-----------
2 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/hw/hw.h b/hw/hw.h
index b47a7c8..eec9c6b 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -499,6 +499,27 @@ extern const VMStateInfo vmstate_info_unused_buffer;
.offset = offsetof(_state, _field), \
}
+#define VMSTATE_STRUCT_VARRAY_POINTER_INT32(_field, _state, _field_num, _vmsd,
_type) { \
+ .name = (stringify(_field)), \
+ .version_id = 0, \
+ .num_offset = vmstate_offset_value(_state, _field_num, int32_t), \
+ .size = sizeof(_type), \
+ .vmsd = &(_vmsd), \
+ .flags = VMS_POINTER | VMS_VARRAY_INT32 | VMS_STRUCT, \
+ .offset = vmstate_offset_pointer(_state, _field, _type), \
+}
+
+#define VMSTATE_STRUCT_VARRAY_POINTER_UINT16(_field, _state, _field_num,
_vmsd, _type) { \
+ .name = (stringify(_field)), \
+ .version_id = 0, \
+ .num_offset = vmstate_offset_value(_state, _field_num, uint16_t), \
+ .size = sizeof(_type), \
+ .vmsd = &(_vmsd), \
+ .flags = VMS_POINTER | VMS_VARRAY_UINT16 | VMS_STRUCT, \
+ .offset = vmstate_offset_pointer(_state, _field, _type), \
+}
+
+
#define VMSTATE_STATIC_BUFFER(_field, _state, _version, _test, _start, _size)
{ \
.name = (stringify(_field)), \
.version_id = (_version), \
diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c
index 6e653dd..0c4e8a5 100644
--- a/hw/pcie_aer.c
+++ b/hw/pcie_aer.c
@@ -785,16 +785,6 @@ static const VMStateDescription vmstate_pcie_aer_err = {
}
};
-#define VMSTATE_PCIE_AER_ERRS(_field, _state, _field_num, _vmsd, _type) { \
- .name = (stringify(_field)), \
- .version_id = 0, \
- .num_offset = vmstate_offset_value(_state, _field_num, uint16_t), \
- .size = sizeof(_type), \
- .vmsd = &(_vmsd), \
- .flags = VMS_POINTER | VMS_VARRAY_UINT16 | VMS_STRUCT, \
- .offset = vmstate_offset_pointer(_state, _field, _type), \
-}
-
const VMStateDescription vmstate_pcie_aer_log = {
.name = "PCIE_AER_ERROR_LOG",
.version_id = 1,
@@ -803,7 +793,7 @@ const VMStateDescription vmstate_pcie_aer_log = {
.fields = (VMStateField[]) {
VMSTATE_UINT16(log_num, PCIEAERLog),
VMSTATE_UINT16(log_max, PCIEAERLog),
- VMSTATE_PCIE_AER_ERRS(log, PCIEAERLog, log_num,
+ VMSTATE_STRUCT_VARRAY_POINTER_UINT16(log, PCIEAERLog, log_num,
vmstate_pcie_aer_err, PCIEAERErr),
VMSTATE_END_OF_LIST()
}
--
1.7.2.3
- [Qemu-devel] [PATCH 0/10] pxa2xx: work on switching to qdev/vmstate, Dmitry Eremin-Solenikov, 2011/02/20
- [Qemu-devel] [PATCH 01/10] arm-pic: add one extra interrupt to support EXITTB interrupts, Dmitry Eremin-Solenikov, 2011/02/20
- [Qemu-devel] [PATCH 03/10] pxa2xx_gpio: simplify by reusing wake irq from arm_pic, Dmitry Eremin-Solenikov, 2011/02/20
- [Qemu-devel] [PATCH 02/10] pxa2xx_pic: update to use qdev and arm-pic, Dmitry Eremin-Solenikov, 2011/02/20
- [Qemu-devel] [PATCH 04/10] vmstate: add VMSTATE_STRUCT_ARRAY_TEST, Dmitry Eremin-Solenikov, 2011/02/20
- [Qemu-devel] [PATCH 05/10] pxa2xx_timer: change info struct name to comply with guidelines, Dmitry Eremin-Solenikov, 2011/02/20
- [Qemu-devel] [PATCH 06/10] pxa2xx_timer: switch to using qdev/vmstate, Dmitry Eremin-Solenikov, 2011/02/20
- [Qemu-devel] [PATCH 07/10] vmstate: move VMSTATE_PCIE_AER_ERRS to hw/hw.h,
Dmitry Eremin-Solenikov <=
- [Qemu-devel] [PATCH 08/10] pxa2xx_dma: drop unused pxa2xx_dma_handler_t/handler field, Dmitry Eremin-Solenikov, 2011/02/20
- [Qemu-devel] [PATCH 09/10] pxa2xx_dma: port to qdev/vmstate, Dmitry Eremin-Solenikov, 2011/02/20
- [Qemu-devel] [PATCH 10/10] pxa2xx: port pxa2xx_rtc to using qdev/vmstate, Dmitry Eremin-Solenikov, 2011/02/20