[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/58] vmstate: port arm_timer
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 16/58] vmstate: port arm_timer |
Date: |
Thu, 24 Feb 2011 18:57:13 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/arm_timer.c | 37 ++++++++++++++-----------------------
1 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/hw/arm_timer.c b/hw/arm_timer.c
index cfd1ebe..dac9e70 100644
--- a/hw/arm_timer.c
+++ b/hw/arm_timer.c
@@ -140,28 +140,19 @@ static void arm_timer_tick(void *opaque)
arm_timer_update(s);
}
-static void arm_timer_save(QEMUFile *f, void *opaque)
-{
- arm_timer_state *s = (arm_timer_state *)opaque;
- qemu_put_be32(f, s->control);
- qemu_put_be32(f, s->limit);
- qemu_put_be32(f, s->int_level);
- qemu_put_ptimer(f, s->timer);
-}
-
-static int arm_timer_load(QEMUFile *f, void *opaque, int version_id)
-{
- arm_timer_state *s = (arm_timer_state *)opaque;
-
- if (version_id != 1)
- return -EINVAL;
-
- s->control = qemu_get_be32(f);
- s->limit = qemu_get_be32(f);
- s->int_level = qemu_get_be32(f);
- qemu_get_ptimer(f, s->timer);
- return 0;
-}
+static const VMStateDescription vmstate_arm_timer = {
+ .name = "arm_timer",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32(control, arm_timer_state),
+ VMSTATE_UINT32(limit, arm_timer_state),
+ VMSTATE_INT32(int_level, arm_timer_state),
+ VMSTATE_PTIMER(timer, arm_timer_state),
+ VMSTATE_END_OF_LIST()
+ }
+};
static arm_timer_state *arm_timer_init(uint32_t freq)
{
@@ -174,7 +165,7 @@ static arm_timer_state *arm_timer_init(uint32_t freq)
bh = qemu_bh_new(arm_timer_tick, s);
s->timer = ptimer_init(bh);
- register_savevm(NULL, "arm_timer", -1, 1, arm_timer_save, arm_timer_load,
s);
+ vmstate_register(NULL, -1, &vmstate_arm_timer, s);
return s;
}
--
1.7.4
- [Qemu-devel] [PATCH 37/58] vmstate: port ppc4xx_pci, (continued)
- [Qemu-devel] [PATCH 37/58] vmstate: port ppc4xx_pci, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 52/58] vmstate: port nand, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 36/58] vmstate: port ppce500_pci, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 45/58] vmstate: port pxa2xx_dma, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 18/58] vmstate: port pmtimer, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 49/58] max111x: input field is only used as uint8_t, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 05/58] vmstate: add VMSTATE_INT64_ARRAY, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 43/58] vmstate: stellaris use unused for placeholder entries, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 08/58] vmstate: be able to store/save a pci device from a pointer, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 16/58] vmstate: port arm_timer,
Juan Quintela <=
- [Qemu-devel] [PATCH 12/58] vmstate: port ads7846, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 14/58] vmstate: port mipsnet, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 31/58] vmstate: port pxa2xx_i2s, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 28/58] vmstate: port heathrow_pic, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 48/58] vmstate: port pxa2xx_lcdc, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 53/58] mac_nvram: size is a size, no need to be a target dependent type, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 07/58] vmstate: Add a way to send a partial array, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 46/58] pxa2xx_lcd: name anonymous struct, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 15/58] vmstate: port arm sp804, Juan Quintela, 2011/02/24