[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 34/58] vmstate: port pxa2xx_pm
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 34/58] vmstate: port pxa2xx_pm |
Date: |
Thu, 24 Feb 2011 18:57:31 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/pxa2xx.c | 33 ++++++++++++---------------------
1 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c
index a044c1f..349a5d4 100644
--- a/hw/pxa2xx.c
+++ b/hw/pxa2xx.c
@@ -147,25 +147,16 @@ static CPUWriteMemoryFunc * const pxa2xx_pm_writefn[] = {
pxa2xx_pm_write,
};
-static void pxa2xx_pm_save(QEMUFile *f, void *opaque)
-{
- PXA2xxState *s = (PXA2xxState *) opaque;
- int i;
-
- for (i = 0; i < 0x40; i ++)
- qemu_put_be32s(f, &s->pm_regs[i]);
-}
-
-static int pxa2xx_pm_load(QEMUFile *f, void *opaque, int version_id)
-{
- PXA2xxState *s = (PXA2xxState *) opaque;
- int i;
-
- for (i = 0; i < 0x40; i ++)
- qemu_get_be32s(f, &s->pm_regs[i]);
-
- return 0;
-}
+static const VMStateDescription vmstate_pxa2xx_pm = {
+ .name = "pxa2xx_pm",
+ .version_id = 0,
+ .minimum_version_id = 0,
+ .minimum_version_id_old = 0,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32_ARRAY(pm_regs, PXA2xxState, 0x40),
+ VMSTATE_END_OF_LIST()
+ }
+};
#define CCCR 0x00 /* Core Clock Configuration register */
#define CKEN 0x04 /* Clock Enable register */
@@ -2115,7 +2106,7 @@ PXA2xxState *pxa270_init(unsigned int sdram_size, const
char *revision)
iomemtype = cpu_register_io_memory(pxa2xx_pm_readfn,
pxa2xx_pm_writefn, s, DEVICE_NATIVE_ENDIAN);
cpu_register_physical_memory(s->pm_base, 0x100, iomemtype);
- register_savevm(NULL, "pxa2xx_pm", 0, 0, pxa2xx_pm_save, pxa2xx_pm_load,
s);
+ vmstate_register(NULL, 0, &vmstate_pxa2xx_pm, s);
for (i = 0; pxa27x_ssp[i].io_base; i ++);
s->ssp = (SSIBus **)qemu_mallocz(sizeof(SSIBus *) * i);
@@ -2238,7 +2229,7 @@ PXA2xxState *pxa255_init(unsigned int sdram_size)
iomemtype = cpu_register_io_memory(pxa2xx_pm_readfn,
pxa2xx_pm_writefn, s, DEVICE_NATIVE_ENDIAN);
cpu_register_physical_memory(s->pm_base, 0x100, iomemtype);
- register_savevm(NULL, "pxa2xx_pm", 0, 0, pxa2xx_pm_save, pxa2xx_pm_load,
s);
+ vmstate_register(NULL, 0, &vmstate_pxa2xx_pm, s);
for (i = 0; pxa255_ssp[i].io_base; i ++);
s->ssp = (SSIBus **)qemu_mallocz(sizeof(SSIBus *) * i);
--
1.7.4
- [Qemu-devel] [PATCH 55/58] piix4: create PIIX4State, (continued)
- [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, 2011/02/24
- [Qemu-devel] [PATCH 34/58] vmstate: port pxa2xx_pm,
Juan Quintela <=
- [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
- [Qemu-devel] [PATCH 18/58] vmstate: port pmtimer, Juan Quintela, 2011/02/24