[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 26/58] vmstate: port stellaris sys
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 26/58] vmstate: port stellaris sys |
Date: |
Thu, 24 Feb 2011 18:57:23 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/stellaris.c | 71 +++++++++++++++++++------------------------------------
1 files changed, 25 insertions(+), 46 deletions(-)
diff --git a/hw/stellaris.c b/hw/stellaris.c
index 3e77b8f..9fce160 100644
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -605,58 +605,37 @@ static void ssys_reset(void *opaque)
s->dcgc[0] = 1;
}
-static void ssys_save(QEMUFile *f, void *opaque)
+static int stellaris_sys_post_load(void *opaque, int version_id)
{
- ssys_state *s = (ssys_state *)opaque;
-
- qemu_put_be32(f, s->pborctl);
- qemu_put_be32(f, s->ldopctl);
- qemu_put_be32(f, s->int_mask);
- qemu_put_be32(f, s->int_status);
- qemu_put_be32(f, s->resc);
- qemu_put_be32(f, s->rcc);
- qemu_put_be32(f, s->rcgc[0]);
- qemu_put_be32(f, s->rcgc[1]);
- qemu_put_be32(f, s->rcgc[2]);
- qemu_put_be32(f, s->scgc[0]);
- qemu_put_be32(f, s->scgc[1]);
- qemu_put_be32(f, s->scgc[2]);
- qemu_put_be32(f, s->dcgc[0]);
- qemu_put_be32(f, s->dcgc[1]);
- qemu_put_be32(f, s->dcgc[2]);
- qemu_put_be32(f, s->clkvclr);
- qemu_put_be32(f, s->ldoarst);
-}
-
-static int ssys_load(QEMUFile *f, void *opaque, int version_id)
-{
- ssys_state *s = (ssys_state *)opaque;
-
- if (version_id != 1)
- return -EINVAL;
+ ssys_state *s = opaque;
- s->pborctl = qemu_get_be32(f);
- s->ldopctl = qemu_get_be32(f);
- s->int_mask = qemu_get_be32(f);
- s->int_status = qemu_get_be32(f);
- s->resc = qemu_get_be32(f);
- s->rcc = qemu_get_be32(f);
- s->rcgc[0] = qemu_get_be32(f);
- s->rcgc[1] = qemu_get_be32(f);
- s->rcgc[2] = qemu_get_be32(f);
- s->scgc[0] = qemu_get_be32(f);
- s->scgc[1] = qemu_get_be32(f);
- s->scgc[2] = qemu_get_be32(f);
- s->dcgc[0] = qemu_get_be32(f);
- s->dcgc[1] = qemu_get_be32(f);
- s->dcgc[2] = qemu_get_be32(f);
- s->clkvclr = qemu_get_be32(f);
- s->ldoarst = qemu_get_be32(f);
ssys_calculate_system_clock(s);
return 0;
}
+static const VMStateDescription vmstate_stellaris_sys = {
+ .name = "stellaris_sys",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .post_load = stellaris_sys_post_load,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32(pborctl, ssys_state),
+ VMSTATE_UINT32(ldopctl, ssys_state),
+ VMSTATE_UINT32(int_mask, ssys_state),
+ VMSTATE_UINT32(int_status, ssys_state),
+ VMSTATE_UINT32(resc, ssys_state),
+ VMSTATE_UINT32(rcc, ssys_state),
+ VMSTATE_UINT32_ARRAY(rcgc, ssys_state, 3),
+ VMSTATE_UINT32_ARRAY(scgc, ssys_state, 3),
+ VMSTATE_UINT32_ARRAY(dcgc, ssys_state, 3),
+ VMSTATE_UINT32(clkvclr, ssys_state),
+ VMSTATE_UINT32(ldoarst, ssys_state),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static int stellaris_sys_init(uint32_t base, qemu_irq irq,
stellaris_board_info * board,
uint8_t *macaddr)
@@ -676,7 +655,7 @@ static int stellaris_sys_init(uint32_t base, qemu_irq irq,
DEVICE_NATIVE_ENDIAN);
cpu_register_physical_memory(base, 0x00001000, iomemtype);
ssys_reset(s);
- register_savevm(NULL, "stellaris_sys", -1, 1, ssys_save, ssys_load, s);
+ vmstate_register(NULL, -1, &vmstate_stellaris_sys, s);
return 0;
}
--
1.7.4
- Re: [Qemu-devel] [PATCH 46/58] pxa2xx_lcd: name anonymous struct, (continued)
- [Qemu-devel] [PATCH 15/58] vmstate: port arm sp804, Juan Quintela, 2011/02/24
- [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 <=
- [Qemu-devel] [PATCH 27/58] vmstate: port pl022 ssp, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 30/58] vmstate: port stellaris gptm, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 47/58] pxa2xx_lcd: up field is used as a bool and migrated as an uint8_t, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 01/58] vmstate: add VMSTATE_UINT32_EQUAL, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 09/58] vmstate: move timers to use test instead of version, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 23/58] vmstate: port armv7m nvic, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 03/58] vmstate: add UINT32 VARRAYS, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 32/58] vmstate: port pxa2xx_cm, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 42/58] vmstate: port stellaris gamepad, Juan Quintela, 2011/02/24