[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/5] stellaris_input: Fix vmstate description of butt
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 2/5] stellaris_input: Fix vmstate description of buttons field |
Date: |
Fri, 26 Jul 2019 16:19:49 +0100 |
gamepad_state::buttons is a pointer to an array of structs,
not an array of structs, so should be declared in the vmstate
with VMSTATE_STRUCT_VARRAY_POINTER_INT32; otherwise we
corrupt memory on incoming migration.
We bump the vmstate version field as the easiest way to
deal with the migration break, since migration wouldn't have
worked reliably before anyway.
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Damien Hedde <address@hidden>
Message-id: address@hidden
---
hw/input/stellaris_input.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/input/stellaris_input.c b/hw/input/stellaris_input.c
index 20c87d86f40..3a666d61d47 100644
--- a/hw/input/stellaris_input.c
+++ b/hw/input/stellaris_input.c
@@ -60,12 +60,14 @@ static const VMStateDescription vmstate_stellaris_button = {
static const VMStateDescription vmstate_stellaris_gamepad = {
.name = "stellaris_gamepad",
- .version_id = 1,
- .minimum_version_id = 1,
+ .version_id = 2,
+ .minimum_version_id = 2,
.fields = (VMStateField[]) {
VMSTATE_INT32(extension, gamepad_state),
- VMSTATE_STRUCT_VARRAY_INT32(buttons, gamepad_state, num_buttons, 0,
- vmstate_stellaris_button, gamepad_button),
+ VMSTATE_STRUCT_VARRAY_POINTER_INT32(buttons, gamepad_state,
+ num_buttons,
+ vmstate_stellaris_button,
+ gamepad_button),
VMSTATE_END_OF_LIST()
}
};
--
2.20.1
- [Qemu-devel] [PULL 0/5] target-arm queue, Peter Maydell, 2019/07/22
- [Qemu-devel] [PULL 1/5] target/arm: Add missing break statement for Hypervisor Trap Exception, Peter Maydell, 2019/07/22
- [Qemu-devel] [PULL 2/5] hw/arm/fsl-imx6ul.c: Remove dead SMP-related code, Peter Maydell, 2019/07/22
- [Qemu-devel] [PULL 3/5] target/arm: Limit ID register assertions to TCG, Peter Maydell, 2019/07/22
- [Qemu-devel] [PULL 5/5] contrib/elf2dmp: Build download.o with CURL_CFLAGS, Peter Maydell, 2019/07/22
- [Qemu-devel] [PULL 4/5] configure: Clarify URL to source downloads, Peter Maydell, 2019/07/22
- Re: [Qemu-devel] [PULL 0/5] target-arm queue, Peter Maydell, 2019/07/22
- [Qemu-devel] [PULL 0/5] target-arm queue, Peter Maydell, 2019/07/26
- [Qemu-devel] [PULL 1/5] pl330: fix vmstate description, Peter Maydell, 2019/07/26
- [Qemu-devel] [PULL 2/5] stellaris_input: Fix vmstate description of buttons field,
Peter Maydell <=
- [Qemu-devel] [PULL 3/5] vmstate.h: Type check VMSTATE_STRUCT_VARRAY macros, Peter Maydell, 2019/07/26
- [Qemu-devel] [PULL 4/5] hw/arm/boot: Rename elf_{low, high}_addr to image_{low, high}_addr, Peter Maydell, 2019/07/26
- [Qemu-devel] [PULL 5/5] hw/arm/boot: Further improve initrd positioning code, Peter Maydell, 2019/07/26
- Re: [Qemu-devel] [PULL 0/5] target-arm queue, Peter Maydell, 2019/07/26