migration: add version supporting macros for struct pointer
This adds version supporting macros VMSTATE_STRUCT_POINTER_TEST_V and VMSTATE_STRUCT_POINTER_V in addition to the already existing VMSTATE_STRUCT_POINTER and VMSTATE_STRUCT_POINTER_TEST macros. Cc: Andreas Färber <afaerber@suse.de> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
parent
dd286ed700
commit
7102400d40
|
@ -310,8 +310,18 @@ extern const VMStateInfo vmstate_info_bitmap;
|
||||||
.offset = vmstate_offset_value(_state, _field, _type), \
|
.offset = vmstate_offset_value(_state, _field, _type), \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define VMSTATE_STRUCT_POINTER_TEST(_field, _state, _test, _vmsd, _type) { \
|
#define VMSTATE_STRUCT_POINTER_V(_field, _state, _version, _vmsd, _type) { \
|
||||||
.name = (stringify(_field)), \
|
.name = (stringify(_field)), \
|
||||||
|
.version_id = (_version), \
|
||||||
|
.vmsd = &(_vmsd), \
|
||||||
|
.size = sizeof(_type), \
|
||||||
|
.flags = VMS_STRUCT|VMS_POINTER, \
|
||||||
|
.offset = vmstate_offset_value(_state, _field, _type), \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define VMSTATE_STRUCT_POINTER_TEST_V(_field, _state, _test, _version, _vmsd, _type) { \
|
||||||
|
.name = (stringify(_field)), \
|
||||||
|
.version_id = (_version), \
|
||||||
.field_exists = (_test), \
|
.field_exists = (_test), \
|
||||||
.vmsd = &(_vmsd), \
|
.vmsd = &(_vmsd), \
|
||||||
.size = sizeof(_type), \
|
.size = sizeof(_type), \
|
||||||
|
@ -497,7 +507,10 @@ extern const VMStateInfo vmstate_info_bitmap;
|
||||||
VMSTATE_STRUCT_TEST(_field, _state, NULL, _version, _vmsd, _type)
|
VMSTATE_STRUCT_TEST(_field, _state, NULL, _version, _vmsd, _type)
|
||||||
|
|
||||||
#define VMSTATE_STRUCT_POINTER(_field, _state, _vmsd, _type) \
|
#define VMSTATE_STRUCT_POINTER(_field, _state, _vmsd, _type) \
|
||||||
VMSTATE_STRUCT_POINTER_TEST(_field, _state, NULL, _vmsd, _type)
|
VMSTATE_STRUCT_POINTER_V(_field, _state, 0, _vmsd, _type)
|
||||||
|
|
||||||
|
#define VMSTATE_STRUCT_POINTER_TEST(_field, _state, _test, _vmsd, _type) \
|
||||||
|
VMSTATE_STRUCT_POINTER_TEST_V(_field, _state, _test, 0, _vmsd, _type)
|
||||||
|
|
||||||
#define VMSTATE_STRUCT_ARRAY(_field, _state, _num, _version, _vmsd, _type) \
|
#define VMSTATE_STRUCT_ARRAY(_field, _state, _num, _version, _vmsd, _type) \
|
||||||
VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _num, NULL, _version, \
|
VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _num, NULL, _version, \
|
||||||
|
|
Loading…
Reference in a new issue