david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/arm_mptimer: Save the timer state

Browse Source 
Add a missing VMSTATE_TIMER() entry to the arm_mptimer vmstate
description; this omission meant that we would probably hang on reload
when the timer failed to fire.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Message-id: 1363967348-3044-1-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2013-04-05 16:17:58 +01:00
parent e8945b4f2a
commit 28092a23e6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/arm_mptimer.c
View File

@ -253,14 +253,15 @@ static int arm_mptimer_init(SysBusDevice *dev)
static const VMStateDescription vmstate_timerblock = { static const VMStateDescription vmstate_timerblock = {
.name = "arm_mptimer_timerblock", .name = "arm_mptimer_timerblock",
.version_id = 1, .version_id = 2,
.minimum_version_id = 1, .minimum_version_id = 2,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_UINT32(count, TimerBlock), VMSTATE_UINT32(count, TimerBlock),
VMSTATE_UINT32(load, TimerBlock), VMSTATE_UINT32(load, TimerBlock),
VMSTATE_UINT32(control, TimerBlock), VMSTATE_UINT32(control, TimerBlock),
VMSTATE_UINT32(status, TimerBlock), VMSTATE_UINT32(status, TimerBlock),
VMSTATE_INT64(tick, TimerBlock), VMSTATE_INT64(tick, TimerBlock),
VMSTATE_TIMER(timer, TimerBlock),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
}; };