mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vmstate: Make VMSTATE_STRUCT_POINTER take type, not ptr-to-type

Browse Source 
The VMSTATE_STRUCT_POINTER macros are a bit odd in that they
must be passed an argument "FooType *" rather than just taking
the FooType. They're only used in one place, so it's easy to
tidy this up. This also lets us use the macro to replace the
hand-rolled VMSTATE_PTIMER.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Peter Maydell 2014-01-01 21:56:57 +00:00 committed by Juan Quintela
parent 8cfc114a2f
commit 20bcf73fa8
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/arm/pxa2xx.c
View File

@ -1448,7 +1448,7 @@ static const VMStateDescription vmstate_pxa2xx_i2c = {
VMSTATE_UINT8(ibmr, PXA2xxI2CState), VMSTATE_UINT8(ibmr, PXA2xxI2CState),
VMSTATE_UINT8(data, PXA2xxI2CState), VMSTATE_UINT8(data, PXA2xxI2CState),
VMSTATE_STRUCT_POINTER(slave, PXA2xxI2CState, VMSTATE_STRUCT_POINTER(slave, PXA2xxI2CState,
vmstate_pxa2xx_i2c_slave, PXA2xxI2CSlaveState *), vmstate_pxa2xx_i2c_slave, PXA2xxI2CSlaveState),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
}; };

10
include/hw/ptimer.h
View File

@ -27,14 +27,8 @@ void ptimer_stop(ptimer_state *s);
extern const VMStateDescription vmstate_ptimer; extern const VMStateDescription vmstate_ptimer;
#define VMSTATE_PTIMER(_field, _state) { \ #define VMSTATE_PTIMER(_field, _state) \
.name = (stringify(_field)), \ VMSTATE_STRUCT_POINTER_V(_field, _state, 1, vmstate_ptimer, ptimer_state)
.version_id = (1), \
.vmsd = &vmstate_ptimer, \
.size = sizeof(ptimer_state *), \
.flags = VMS_STRUCT|VMS_POINTER, \
.offset = vmstate_offset_pointer(_state, _field, ptimer_state), \
}
#define VMSTATE_PTIMER_ARRAY(_f, _s, _n) \ #define VMSTATE_PTIMER_ARRAY(_f, _s, _n) \
VMSTATE_ARRAY_OF_POINTER_TO_STRUCT(_f, _s, _n, 0, \ VMSTATE_ARRAY_OF_POINTER_TO_STRUCT(_f, _s, _n, 0, \

8
include/migration/vmstate.h
View File

@ -314,9 +314,9 @@ extern const VMStateInfo vmstate_info_bitmap;
.name = (stringify(_field)), \ .name = (stringify(_field)), \
.version_id = (_version), \ .version_id = (_version), \
.vmsd = &(_vmsd), \ .vmsd = &(_vmsd), \
.size = sizeof(_type), \ .size = sizeof(_type *), \
.flags = VMS_STRUCT|VMS_POINTER, \ .flags = VMS_STRUCT|VMS_POINTER, \
.offset = vmstate_offset_value(_state, _field, _type), \ .offset = vmstate_offset_pointer(_state, _field, _type), \
} }
#define VMSTATE_STRUCT_POINTER_TEST_V(_field, _state, _test, _version, _vmsd, _type) { \ #define VMSTATE_STRUCT_POINTER_TEST_V(_field, _state, _test, _version, _vmsd, _type) { \
@ -324,9 +324,9 @@ extern const VMStateInfo vmstate_info_bitmap;
.version_id = (_version), \ .version_id = (_version), \
.field_exists = (_test), \ .field_exists = (_test), \
.vmsd = &(_vmsd), \ .vmsd = &(_vmsd), \
.size = sizeof(_type), \ .size = sizeof(_type *), \
.flags = VMS_STRUCT|VMS_POINTER, \ .flags = VMS_STRUCT|VMS_POINTER, \
.offset = vmstate_offset_value(_state, _field, _type), \ .offset = vmstate_offset_pointer(_state, _field, _type), \
} }
#define VMSTATE_ARRAY_OF_POINTER(_field, _state, _num, _version, _info, _type) {\ #define VMSTATE_ARRAY_OF_POINTER(_field, _state, _num, _version, _info, _type) {\