Commit 6b892b2f authored by Cédric Le Goater's avatar Cédric Le Goater Committed by Peter Maydell
Browse files

timer/aspeed: fix vmstate version id 



commit 1d3e65aa ("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: default avatarCédric Le Goater <clg@kaod.org>
Message-id: 20180423101433.17759-1-clg@kaod.org
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent a2e9989c

hw/timer/aspeed_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -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()

    }