diff options
| author | Peter Maydell | 2022-01-20 16:16:09 +0100 |
|---|---|---|
| committer | Peter Maydell | 2022-01-28 15:29:46 +0100 |
| commit | 62a4d87d2e4af378875e0749571fe41cab8706de (patch) | |
| tree | 47aee4aff60e4340effb94f8e70a7f9ce22cf800 /hw/arm/armv7m.c | |
| parent | Update copyright dates to 2022 (diff) | |
| download | qemu-62a4d87d2e4af378875e0749571fe41cab8706de.tar.gz qemu-62a4d87d2e4af378875e0749571fe41cab8706de.tar.xz qemu-62a4d87d2e4af378875e0749571fe41cab8706de.zip | |
hw/armv7m: Fix broken VMStateDescription
In commit d5093d961585f02 we added a VMStateDescription to
the TYPE_ARMV7M object, to handle migration of its Clocks.
However a cut-and-paste error meant we used the wrong struct
name in the VMSTATE_CLOCK() macro arguments. The result was
that attempting a 'savevm' might result in an assertion
failure.
Cc: qemu-stable@nongnu.org
Buglink: https://gitlab.com/qemu-project/qemu/-/issues/803
Fixes: d5093d961585f02
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Ani Sinha <ani@anisinha.ca>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20220120151609.433555-1-peter.maydell@linaro.org
Diffstat (limited to 'hw/arm/armv7m.c')
| -rw-r--r-- | hw/arm/armv7m.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 8d08db80be..ceb76df3cd 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -520,8 +520,8 @@ static const VMStateDescription vmstate_armv7m = { .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { - VMSTATE_CLOCK(refclk, SysTickState), - VMSTATE_CLOCK(cpuclk, SysTickState), + VMSTATE_CLOCK(refclk, ARMv7MState), + VMSTATE_CLOCK(cpuclk, ARMv7MState), VMSTATE_END_OF_LIST() } }; |