From addba873042f9f7b3322e37895189ef852d0f94c Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Fri, 16 Oct 2009 12:35:27 +0200 Subject: [PATCH] vmstate: factor vmstate_offset_pointer Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori --- hw/hw.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/hw.h b/hw/hw.h index adf70b2..224b5e5 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -342,6 +342,10 @@ extern const VMStateInfo vmstate_info_buffer; (offsetof(_state, _field) + \ type_check(_type, typeof_field(_state, _field))) +#define vmstate_offset_pointer(_state, _field, _type) \ + (offsetof(_state, _field) + \ + type_check_pointer(_type, typeof_field(_state, _field))) + #define VMSTATE_SINGLE(_field, _state, _version, _info, _type) { \ .name = (stringify(_field)), \ .version_id = (_version), \ @@ -398,8 +402,7 @@ extern const VMStateInfo vmstate_info_buffer; .info = &(_info), \ .size = sizeof(_type), \ .flags = VMS_VARRAY_INT32|VMS_POINTER, \ - .offset = offsetof(_state, _field) \ - + type_check_pointer(_type,typeof_field(_state, _field)) \ + .offset = vmstate_offset_pointer(_state, _field, _type), \ } #define VMSTATE_STRUCT(_field, _state, _version, _vmsd, _type) { \ -- 2.7.4