From 82fa39b75181b730d6d4d09f443bd26bcfcd045c Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Thu, 10 Mar 2011 12:33:49 +0100 Subject: vmstate: Fix varrays with uint8 indexes Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori --- hw/hw.h | 5 +++-- savevm.c | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/hw.h b/hw/hw.h index 02992078df..40c639698e 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -298,6 +298,7 @@ enum VMStateFlags { VMS_VARRAY_UINT16 = 0x080, /* Array with size in uint16_t field */ VMS_VBUFFER = 0x100, /* Buffer with size in int32_t field */ VMS_MULTIPLY = 0x200, /* multiply "size" field by field_size */ + VMS_VARRAY_UINT8 = 0x400, /* Array with size in uint8_t field*/ }; typedef struct { @@ -489,11 +490,11 @@ extern const VMStateInfo vmstate_info_unused_buffer; #define VMSTATE_STRUCT_VARRAY_UINT8(_field, _state, _field_num, _version, _vmsd, _type) { \ .name = (stringify(_field)), \ - .num_offset = vmstate_offset_value(_state, _field_num, uint8_t), \ + .num_offset = vmstate_offset_value(_state, _field_num, uint8_t), \ .version_id = (_version), \ .vmsd = &(_vmsd), \ .size = sizeof(_type), \ - .flags = VMS_STRUCT|VMS_VARRAY_INT32, \ + .flags = VMS_STRUCT|VMS_VARRAY_UINT8, \ .offset = offsetof(_state, _field), \ } diff --git a/savevm.c b/savevm.c index ce063d1e55..4db036b3c7 100644 --- a/savevm.c +++ b/savevm.c @@ -1331,6 +1331,8 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, n_elems = *(int32_t *)(opaque+field->num_offset); } else if (field->flags & VMS_VARRAY_UINT16) { n_elems = *(uint16_t *)(opaque+field->num_offset); + } else if (field->flags & VMS_VARRAY_UINT8) { + n_elems = *(uint8_t *)(opaque+field->num_offset); } if (field->flags & VMS_POINTER) { base_addr = *(void **)base_addr + field->start; -- cgit v1.2.1