On 04/23/2018 11:12 AM, Peter Maydell wrote: >> diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c >> index 50acbf530a3a..7df19bd9df91 100644 >> --- a/hw/timer/aspeed_timer.c >> +++ b/hw/timer/aspeed_timer.c >> @@ -498,8 +498,8 @@ static const VMStateDescription vmstate_aspeed_timer = { >> >> static const VMStateDescription vmstate_aspeed_timer_state = { >> .name = "aspeed.timerctrl", >> - .version_id = 1, >> - .minimum_version_id = 1, >> + .version_id = 2, >> + .minimum_version_id = 2, >> .fields = (VMStateField[]) { >> VMSTATE_UINT32(ctrl, AspeedTimerCtrlState), >> VMSTATE_UINT32(ctrl2, AspeedTimerCtrlState), > Wouldn't it be simpler to just fix the incorrect value in > the VMSTATE_STRUCT_ARRAY(timers, AspeedTimerCtrlState, > line ?
Yes. Also. Or bring back all the version ids to 1, as we never supported migration before. Thanks, C.