[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 23/58] vmstate: port armv7m nvic
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 23/58] vmstate: port armv7m nvic |
Date: |
Thu, 24 Feb 2011 18:57:20 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/armv7m_nvic.c | 39 ++++++++++++++-------------------------
1 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c
index 6c7ce01..397f5c9 100644
--- a/hw/armv7m_nvic.c
+++ b/hw/armv7m_nvic.c
@@ -365,30 +365,19 @@ static void nvic_writel(void *opaque, uint32_t offset,
uint32_t value)
}
}
-static void nvic_save(QEMUFile *f, void *opaque)
-{
- nvic_state *s = (nvic_state *)opaque;
-
- qemu_put_be32(f, s->systick.control);
- qemu_put_be32(f, s->systick.reload);
- qemu_put_be64(f, s->systick.tick);
- qemu_put_timer(f, s->systick.timer);
-}
-
-static int nvic_load(QEMUFile *f, void *opaque, int version_id)
-{
- nvic_state *s = (nvic_state *)opaque;
-
- if (version_id != 1)
- return -EINVAL;
-
- s->systick.control = qemu_get_be32(f);
- s->systick.reload = qemu_get_be32(f);
- s->systick.tick = qemu_get_be64(f);
- qemu_get_timer(f, s->systick.timer);
-
- return 0;
-}
+static const VMStateDescription vmstate_nvic = {
+ .name = "armv7m_nvic",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32(systick.control, nvic_state),
+ VMSTATE_UINT32(systick.reload, nvic_state),
+ VMSTATE_INT64(systick.tick, nvic_state),
+ VMSTATE_TIMER(systick.timer, nvic_state),
+ VMSTATE_END_OF_LIST()
+ }
+};
static int armv7m_nvic_init(SysBusDevice *dev)
{
@@ -397,7 +386,7 @@ static int armv7m_nvic_init(SysBusDevice *dev)
gic_init(&s->gic);
cpu_register_physical_memory(0xe000e000, 0x1000, s->gic.iomemtype);
s->systick.timer = qemu_new_timer(vm_clock, systick_timer_tick, s);
- register_savevm(&dev->qdev, "armv7m_nvic", -1, 1, nvic_save, nvic_load, s);
+ vmstate_register(&dev->qdev, -1, &vmstate_nvic, s);
return 0;
}
--
1.7.4
- [Qemu-devel] [PATCH 33/58] vmstate: port pxa2xx_mm, (continued)
- [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
- [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 <=
- [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
- [Qemu-devel] [PATCH 41/58] vmstate: port syborg_keyboard, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 24/58] vmstate: port stellaris i2c, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 29/58] vmstate: port cuda, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 39/58] vmstate: port stellaris_adc, Juan Quintela, 2011/02/24