[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/14] hw/arm_mptimer: Save the timer state
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 03/14] hw/arm_mptimer: Save the timer state |
Date: |
Fri, 5 Apr 2013 18:13:08 +0100 |
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 <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
---
hw/arm_mptimer.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/arm_mptimer.c b/hw/arm_mptimer.c
index f59a9f1..317f5e4 100644
--- a/hw/arm_mptimer.c
+++ b/hw/arm_mptimer.c
@@ -253,14 +253,15 @@ static int arm_mptimer_init(SysBusDevice *dev)
static const VMStateDescription vmstate_timerblock = {
.name = "arm_mptimer_timerblock",
- .version_id = 1,
- .minimum_version_id = 1,
+ .version_id = 2,
+ .minimum_version_id = 2,
.fields = (VMStateField[]) {
VMSTATE_UINT32(count, TimerBlock),
VMSTATE_UINT32(load, TimerBlock),
VMSTATE_UINT32(control, TimerBlock),
VMSTATE_UINT32(status, TimerBlock),
VMSTATE_INT64(tick, TimerBlock),
+ VMSTATE_TIMER(timer, TimerBlock),
VMSTATE_END_OF_LIST()
}
};
--
1.7.9.5
- [Qemu-devel] [PULL 00/14] arm-devs queue, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 04/14] vmstate.h: introduce VMSTATE_BUFFER_POINTER_UNSAFE macro, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 14/14] hw/nand.c: Fix nand erase operation, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 03/14] hw/arm_mptimer: Save the timer state,
Peter Maydell <=
- [Qemu-devel] [PATCH 12/14] pl330: Don't inhibit ES bits on INTEN, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 11/14] pflash_cfi01: Implement migration support, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 05/14] hw/sd.c: fix migration of dynamically allocated buffer "buf", Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 01/14] hw/arm/nseries: don't print to stdout or stderr, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 13/14] cadence_uart: Flush queued characters on reset, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 09/14] hw/arm_gic_common: Use vmstate struct rather than save/load functions, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 08/14] arm_gic: Fix sizes of state fields in preparation for vmstate support, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 10/14] pflash_cfi01: Drop unused 'bypass' field, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 07/14] vmstate: Add support for two dimensional arrays, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 02/14] pl050: Don't send always-constant is_mouse field, Peter Maydell, 2013/04/05