[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/58] vmstate: port sysborg_timer
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 17/58] vmstate: port sysborg_timer |
Date: |
Thu, 24 Feb 2011 18:57:14 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/syborg_timer.c | 46 ++++++++++++++++------------------------------
1 files changed, 16 insertions(+), 30 deletions(-)
diff --git a/hw/syborg_timer.c b/hw/syborg_timer.c
index cedcd8e..50c813e 100644
--- a/hw/syborg_timer.c
+++ b/hw/syborg_timer.c
@@ -174,34 +174,21 @@ static CPUWriteMemoryFunc * const syborg_timer_writefn[]
= {
syborg_timer_write
};
-static void syborg_timer_save(QEMUFile *f, void *opaque)
-{
- SyborgTimerState *s = opaque;
-
- qemu_put_be32(f, s->running);
- qemu_put_be32(f, s->oneshot);
- qemu_put_be32(f, s->limit);
- qemu_put_be32(f, s->int_level);
- qemu_put_be32(f, s->int_enabled);
- qemu_put_ptimer(f, s->timer);
-}
-
-static int syborg_timer_load(QEMUFile *f, void *opaque, int version_id)
-{
- SyborgTimerState *s = opaque;
-
- if (version_id != 1)
- return -EINVAL;
-
- s->running = qemu_get_be32(f);
- s->oneshot = qemu_get_be32(f);
- s->limit = qemu_get_be32(f);
- s->int_level = qemu_get_be32(f);
- s->int_enabled = qemu_get_be32(f);
- qemu_get_ptimer(f, s->timer);
-
- return 0;
-}
+static const VMStateDescription vmstate_syborg_timer = {
+ .name = "syborg_timer",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_INT32(running, SyborgTimerState),
+ VMSTATE_INT32(oneshot, SyborgTimerState),
+ VMSTATE_UINT32(limit, SyborgTimerState),
+ VMSTATE_UINT32(int_level, SyborgTimerState),
+ VMSTATE_UINT32(int_enabled, SyborgTimerState),
+ VMSTATE_PTIMER(timer, SyborgTimerState),
+ VMSTATE_END_OF_LIST()
+ }
+};
static int syborg_timer_init(SysBusDevice *dev)
{
@@ -222,8 +209,7 @@ static int syborg_timer_init(SysBusDevice *dev)
bh = qemu_bh_new(syborg_timer_tick, s);
s->timer = ptimer_init(bh);
ptimer_set_freq(s->timer, s->freq);
- register_savevm(&dev->qdev, "syborg_timer", -1, 1,
- syborg_timer_save, syborg_timer_load, s);
+ vmstate_register(&dev->qdev, -1, &vmstate_syborg_timer, s);
return 0;
}
--
1.7.4
- [Qemu-devel] [PATCH 56/58] vmstate: port piix4, (continued)
- [Qemu-devel] [PATCH 56/58] vmstate: port piix4, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 55/58] piix4: create PIIX4State, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 57/58] mac_dbdma: create DBDMAState instead of passing one array around, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 58/58] vmstate: port mac_dbdma, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 06/58] vmstate: add VMSTATE_STRUCT_VARRAY_UINT32, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 04/58] vmstate: add VMSTATE_STRUCT_VARRAY_INT32, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 13/58] vmstate: port m48t59, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 25/58] vmstate: port stellaris ssi bus, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 10/58] vmstate: port adb_kbd, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 17/58] vmstate: port sysborg_timer,
Juan Quintela <=
- [Qemu-devel] [PATCH 34/58] vmstate: port pxa2xx_pm, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 50/58] vmstate: port max111x, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 40/58] vmstate: port syborg_serial, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 19/58] vmstate: port syborg_rtc, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 38/58] vmstate: port syborg_pointer, Juan Quintela, 2011/02/24
- [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