[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/5] pl031: rearm alarm timer upon load
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 4/5] pl031: rearm alarm timer upon load |
Date: |
Mon, 5 Mar 2012 10:08:14 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/pl031.c | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/hw/pl031.c b/hw/pl031.c
index 69abc4f..713f85d 100644
--- a/hw/pl031.c
+++ b/hw/pl031.c
@@ -47,21 +47,6 @@ typedef struct {
uint32_t is;
} pl031_state;
-static const VMStateDescription vmstate_pl031 = {
- .name = "pl031",
- .version_id = 1,
- .minimum_version_id = 1,
- .fields = (VMStateField[]) {
- VMSTATE_UINT32(tick_offset, pl031_state),
- VMSTATE_UINT32(mr, pl031_state),
- VMSTATE_UINT32(lr, pl031_state),
- VMSTATE_UINT32(cr, pl031_state),
- VMSTATE_UINT32(im, pl031_state),
- VMSTATE_UINT32(is, pl031_state),
- VMSTATE_END_OF_LIST()
- }
-};
-
static const unsigned char pl031_id[] = {
0x31, 0x10, 0x14, 0x00, /* Device ID */
0x0d, 0xf0, 0x05, 0xb1 /* Cell ID */
@@ -213,6 +198,30 @@ static int pl031_init(SysBusDevice *dev)
return 0;
}
+static int pl031_post_load(void *opaque, int version_id)
+{
+ pl031_state *s = opaque;
+
+ pl031_set_alarm(s);
+ return 0;
+}
+
+static const VMStateDescription vmstate_pl031 = {
+ .name = "pl031",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .post_load = pl031_post_load,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32(tick_offset, pl031_state),
+ VMSTATE_UINT32(mr, pl031_state),
+ VMSTATE_UINT32(lr, pl031_state),
+ VMSTATE_UINT32(cr, pl031_state),
+ VMSTATE_UINT32(im, pl031_state),
+ VMSTATE_UINT32(is, pl031_state),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static void pl031_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
--
1.7.7.6
- [Qemu-devel] [PATCH v2 0/5] Make rt_clock usage configurable for ARM devices, Paolo Bonzini, 2012/03/05
- [Qemu-devel] [PATCH v2 4/5] pl031: rearm alarm timer upon load,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 5/5] pl031: switch clock base to rtc_clock, Paolo Bonzini, 2012/03/05
- [Qemu-devel] [PATCH v2 3/5] arm: switch real-time clocks to rtc_clock, Paolo Bonzini, 2012/03/05
- [Qemu-devel] [PATCH v2 2/5] omap: switch omap_lpg to vm_clock, Paolo Bonzini, 2012/03/05
- [Qemu-devel] [PATCH v2 1/5] rtc: add -rtc clock=rt, Paolo Bonzini, 2012/03/05
- Re: [Qemu-devel] [PATCH v2 0/5] Make rt_clock usage configurable for ARM devices, Peter Maydell, 2012/03/05