[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2] timer/aspeed: fix vmstate version id
From: |
Cédric Le Goater |
Subject: |
[Qemu-devel] [PATCH v2] timer/aspeed: fix vmstate version id |
Date: |
Mon, 23 Apr 2018 12:14:33 +0200 |
commit 1d3e65aa7ac5 ("hw/timer: Add value matching support to
aspeed_timer") increased the vmstate version of aspeed.timer because
the state had changed, but it also bumped the version of the
VMSTATE_STRUCT_ARRAY under the aspeed.timerctrl which did not need to.
Change back this version to fix migration.
Signed-off-by: Cédric Le Goater <address@hidden>
---
To test on a 'palmetto-bmc' board, download the latest built OpenBMC
flash image :
wget
https://openpower.xyz/job/openbmc-build/distro=ubuntu,target=palmetto/lastSuccessfulBuild/artifact/deploy/images/palmetto/flash-palmetto
start two instances of QEMU with :
qemu-system-arm -m 512 -M palmetto-bmc -drive
file=./flash-palmetto,format=raw,if=mtd -serial mon:stdio -nographic -nodefaults
and :
qemu-system-arm -m 512 -M palmetto-bmc -drive
file=./flash-palmetto,format=raw,if=mtd -serial mon:stdio -nographic
-nodefaults -incoming tcp::1234
then, run migrate from the monitor:
(qemu) migrate tcp:localhost:1234
Changes since v1:
- change version of VMSTATE_STRUCT_ARRAY and not vmstate_aspeed_timer_state
hw/timer/aspeed_timer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c
index 50acbf530a3a..1e31e22b6f1f 100644
--- a/hw/timer/aspeed_timer.c
+++ b/hw/timer/aspeed_timer.c
@@ -504,7 +504,7 @@ static const VMStateDescription vmstate_aspeed_timer_state
= {
VMSTATE_UINT32(ctrl, AspeedTimerCtrlState),
VMSTATE_UINT32(ctrl2, AspeedTimerCtrlState),
VMSTATE_STRUCT_ARRAY(timers, AspeedTimerCtrlState,
- ASPEED_TIMER_NR_TIMERS, 2, vmstate_aspeed_timer,
+ ASPEED_TIMER_NR_TIMERS, 1, vmstate_aspeed_timer,
AspeedTimer),
VMSTATE_END_OF_LIST()
}
--
2.13.6
- [Qemu-devel] [PATCH v2] timer/aspeed: fix vmstate version id,
Cédric Le Goater <=