[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/58] vmstate: port arm sp804
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 15/58] vmstate: port arm sp804 |
Date: |
Thu, 24 Feb 2011 18:57:12 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/arm_timer.c | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/hw/arm_timer.c b/hw/arm_timer.c
index 82f05de..cfd1ebe 100644
--- a/hw/arm_timer.c
+++ b/hw/arm_timer.c
@@ -235,24 +235,17 @@ static CPUWriteMemoryFunc * const sp804_writefn[] = {
sp804_write
};
-static void sp804_save(QEMUFile *f, void *opaque)
-{
- sp804_state *s = (sp804_state *)opaque;
- qemu_put_be32(f, s->level[0]);
- qemu_put_be32(f, s->level[1]);
-}
-static int sp804_load(QEMUFile *f, void *opaque, int version_id)
-{
- sp804_state *s = (sp804_state *)opaque;
-
- if (version_id != 1)
- return -EINVAL;
-
- s->level[0] = qemu_get_be32(f);
- s->level[1] = qemu_get_be32(f);
- return 0;
-}
+static const VMStateDescription vmstate_sp804 = {
+ .name = "sp804",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_INT32_ARRAY(level, sp804_state, 2),
+ VMSTATE_END_OF_LIST()
+ }
+};
static int sp804_init(SysBusDevice *dev)
{
@@ -271,7 +264,7 @@ static int sp804_init(SysBusDevice *dev)
iomemtype = cpu_register_io_memory(sp804_readfn,
sp804_writefn, s, DEVICE_NATIVE_ENDIAN);
sysbus_init_mmio(dev, 0x1000, iomemtype);
- register_savevm(&dev->qdev, "sp804", -1, 1, sp804_save, sp804_load, s);
+ vmstate_register(&dev->qdev, -1, &vmstate_sp804, s);
return 0;
}
--
1.7.4
- [Qemu-devel] [PATCH 16/58] vmstate: port arm_timer, (continued)
- [Qemu-devel] [PATCH 16/58] vmstate: port arm_timer, Juan Quintela, 2011/02/24
- [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 <=
- [Qemu-devel] [PATCH 51/58] nand: pin values are uint8_t, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 44/58] pxa2xx_dma: make req array static, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 54/58] vmstate: port mac_nvram, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 02/58] vmstate: Fix varrays with uint8 indexes, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 33/58] vmstate: port pxa2xx_mm, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 21/58] vmstate: port pxa2xx_keypad, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 20/58] vmstate: port pxa2xx_pic, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 22/58] vmstate: port pl011, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 26/58] vmstate: port stellaris sys, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 27/58] vmstate: port pl022 ssp, Juan Quintela, 2011/02/24