diff options
| author | Blue Swirl | 2013-04-06 14:53:54 +0200 |
|---|---|---|
| committer | Blue Swirl | 2013-04-06 14:53:54 +0200 |
| commit | 9196dd411d580c27f85daa209ff9a501d719ebc0 (patch) | |
| tree | 48f15e89b2be219c1d106328c044d250b2f9cb05 /hw/arm_mptimer.c | |
| parent | main-loop: drop the BQL if the I/O appears to be spinning (diff) | |
| parent | hw/nand.c: Fix nand erase operation (diff) | |
| download | qemu-9196dd411d580c27f85daa209ff9a501d719ebc0.tar.gz qemu-9196dd411d580c27f85daa209ff9a501d719ebc0.tar.xz qemu-9196dd411d580c27f85daa209ff9a501d719ebc0.zip | |
Merge branch 'arm-devs.next' of git://git.linaro.org/people/pmaydell/qemu-arm
* 'arm-devs.next' of git://git.linaro.org/people/pmaydell/qemu-arm:
hw/nand.c: Fix nand erase operation
cadence_uart: Flush queued characters on reset
pl330: Don't inhibit ES bits on INTEN
pflash_cfi01: Implement migration support
pflash_cfi01: Drop unused 'bypass' field
hw/arm_gic_common: Use vmstate struct rather than save/load functions
arm_gic: Fix sizes of state fields in preparation for vmstate support
vmstate: Add support for two dimensional arrays
hw/onenand.c: fix migration of dynamically allocated buffer "otp"
hw/sd.c: fix migration of dynamically allocated buffer "buf"
vmstate.h: introduce VMSTATE_BUFFER_POINTER_UNSAFE macro
hw/arm_mptimer: Save the timer state
pl050: Don't send always-constant is_mouse field
hw/arm/nseries: don't print to stdout or stderr
Diffstat (limited to 'hw/arm_mptimer.c')
| -rw-r--r-- | hw/arm_mptimer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/arm_mptimer.c b/hw/arm_mptimer.c index f59a9f11f0..317f5e43ed 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() } }; |