From 377e2cb96b76c2b0023c1acc7230bf3a9e9f9f40 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Tue, 12 Mar 2013 14:06:04 +1100 Subject: savevm: Fix bugs in the VMSTATE_VBUFFER_MULTIPLY definition The VMSTATE_BUFFER_MULTIPLY macro is misnamed - it actually specifies a variably sized buffer with VMS_VBUFFER, so should be named VMSTATE_VBUFFER_MULTIPLY. This patch fixes this (the macro had no current users under either name). In addition, unlike the other VMSTATE_VBUFFER variants, this macro did not specify VMS_POINTER. This patch fixes this bug as well. Signed-off-by: David Gibson Signed-off-by: Juan Quintela --- include/migration/vmstate.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/migration') diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index d8af9f2cb3..65918a9abe 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -393,14 +393,14 @@ extern const VMStateInfo vmstate_info_bitmap; .offset = vmstate_offset_buffer(_state, _field) + _start, \ } -#define VMSTATE_BUFFER_MULTIPLY(_field, _state, _version, _test, _start, _field_size, _multiply) { \ +#define VMSTATE_VBUFFER_MULTIPLY(_field, _state, _version, _test, _start, _field_size, _multiply) { \ .name = (stringify(_field)), \ .version_id = (_version), \ .field_exists = (_test), \ .size_offset = vmstate_offset_value(_state, _field_size, uint32_t),\ .size = (_multiply), \ .info = &vmstate_info_buffer, \ - .flags = VMS_VBUFFER|VMS_MULTIPLY, \ + .flags = VMS_VBUFFER|VMS_POINTER|VMS_MULTIPLY, \ .offset = offsetof(_state, _field), \ .start = (_start), \ } -- cgit v1.2.1