[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 2/9] vmstate: Fix varrays with uint8 indexes
From: |
Yoshiaki Tamura |
Subject: |
Re: [Qemu-devel] [PATCH 2/9] vmstate: Fix varrays with uint8 indexes |
Date: |
Fri, 18 Mar 2011 19:34:55 +0900 |
Juan, Anthony,
It seems this patch broke live migration in my environment. The guest
hangs after switching to remote. The following is parameters of the
guest.
-L /usr/local/seabios --enable-kvm -M pc -m 512 -smp 1 -monitor stdio
-localtime -boot c -drive file=/vm/fedora13.img,if=virtio -net
nic,macaddr=54:52:00:47:a5:a8,model=virtio -net tap -parallel none
-usb -vnc :0
Have you seen similar issues?
Thanks,
Yoshi
2011/3/10 Juan Quintela <address@hidden>:
> Signed-off-by: Juan Quintela <address@hidden>
> ---
> 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 0299207..40c6396 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 ce063d1..4db036b 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;
> --
> 1.7.4
>
>
>
- [Qemu-devel] [PATCH 0/9] VMState infrastructure, Juan Quintela, 2011/03/10
- [Qemu-devel] [PATCH 2/9] vmstate: Fix varrays with uint8 indexes, Juan Quintela, 2011/03/10
- Re: [Qemu-devel] [PATCH 2/9] vmstate: Fix varrays with uint8 indexes,
Yoshiaki Tamura <=
- [Qemu-devel] [PATCH 1/9] vmstate: add VMSTATE_UINT32_EQUAL, Juan Quintela, 2011/03/10
- [Qemu-devel] [PATCH 3/9] vmstate: add UINT32 VARRAYS, Juan Quintela, 2011/03/10
- [Qemu-devel] [PATCH 5/9] vmstate: add VMSTATE_INT64_ARRAY, Juan Quintela, 2011/03/10
- [Qemu-devel] [PATCH 4/9] vmstate: add VMSTATE_STRUCT_VARRAY_INT32, Juan Quintela, 2011/03/10
- [Qemu-devel] [PATCH 6/9] vmstate: add VMSTATE_STRUCT_VARRAY_UINT32, Juan Quintela, 2011/03/10
- [Qemu-devel] [PATCH 8/9] vmstate: be able to store/save a pci device from a pointer, Juan Quintela, 2011/03/10
- [Qemu-devel] [PATCH 9/9] vmstate: move timers to use test instead of version, Juan Quintela, 2011/03/10