Commit 377e2cb9 authored by David Gibson's avatar David Gibson Committed by Juan Quintela
Browse files

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: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 8474a9dd

include/migration/vmstate.h

+2 −2
Original line number Diff line number Diff line
@@ -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),                                        \

}