mirror of https://gitlab.com/qemu-project/qemu
vmstate: move VMSTATE_PCIE_AER_ERRS to hw/hw.h
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 <dbaryshkov@gmail.com> Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
This commit is contained in:
parent
ee2479d3e8
commit
47188700a4
20
hw/hw.h
20
hw/hw.h
|
@ -496,6 +496,26 @@ extern const VMStateInfo vmstate_info_unused_buffer;
|
||||||
.offset = offsetof(_state, _field), \
|
.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) { \
|
#define VMSTATE_STATIC_BUFFER(_field, _state, _version, _test, _start, _size) { \
|
||||||
.name = (stringify(_field)), \
|
.name = (stringify(_field)), \
|
||||||
.version_id = (_version), \
|
.version_id = (_version), \
|
||||||
|
|
|
@ -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 = {
|
const VMStateDescription vmstate_pcie_aer_log = {
|
||||||
.name = "PCIE_AER_ERROR_LOG",
|
.name = "PCIE_AER_ERROR_LOG",
|
||||||
.version_id = 1,
|
.version_id = 1,
|
||||||
|
@ -803,7 +793,7 @@ const VMStateDescription vmstate_pcie_aer_log = {
|
||||||
.fields = (VMStateField[]) {
|
.fields = (VMStateField[]) {
|
||||||
VMSTATE_UINT16(log_num, PCIEAERLog),
|
VMSTATE_UINT16(log_num, PCIEAERLog),
|
||||||
VMSTATE_UINT16(log_max, 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_pcie_aer_err, PCIEAERErr),
|
||||||
VMSTATE_END_OF_LIST()
|
VMSTATE_END_OF_LIST()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue