[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 40/58] vmstate: port syborg_serial
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 40/58] vmstate: port syborg_serial |
Date: |
Thu, 24 Feb 2011 18:57:37 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/syborg_serial.c | 60 +++++++++++++++------------------------------------
1 files changed, 18 insertions(+), 42 deletions(-)
diff --git a/hw/syborg_serial.c b/hw/syborg_serial.c
index 34ce076..df2950f 100644
--- a/hw/syborg_serial.c
+++ b/hw/syborg_serial.c
@@ -273,47 +273,24 @@ static CPUWriteMemoryFunc * const syborg_serial_writefn[]
= {
syborg_serial_write
};
-static void syborg_serial_save(QEMUFile *f, void *opaque)
-{
- SyborgSerialState *s = opaque;
- int i;
-
- qemu_put_be32(f, s->fifo_size);
- qemu_put_be32(f, s->int_enable);
- qemu_put_be32(f, s->read_pos);
- qemu_put_be32(f, s->read_count);
- qemu_put_be32(f, s->dma_tx_ptr);
- qemu_put_be32(f, s->dma_rx_ptr);
- qemu_put_be32(f, s->dma_rx_size);
- for (i = 0; i < s->fifo_size; i++) {
- qemu_put_be32(f, s->read_fifo[i]);
- }
-}
-
-static int syborg_serial_load(QEMUFile *f, void *opaque, int version_id)
-{
- SyborgSerialState *s = opaque;
- int i;
-
- if (version_id != 1)
- return -EINVAL;
-
- i = qemu_get_be32(f);
- if (s->fifo_size != i)
- return -EINVAL;
-
- s->int_enable = qemu_get_be32(f);
- s->read_pos = qemu_get_be32(f);
- s->read_count = qemu_get_be32(f);
- s->dma_tx_ptr = qemu_get_be32(f);
- s->dma_rx_ptr = qemu_get_be32(f);
- s->dma_rx_size = qemu_get_be32(f);
- for (i = 0; i < s->fifo_size; i++) {
- s->read_fifo[i] = qemu_get_be32(f);
+static const VMStateDescription vmstate_syborg_serial = {
+ .name = "syborg_serial",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32_EQUAL(fifo_size, SyborgSerialState),
+ VMSTATE_UINT32(int_enable, SyborgSerialState),
+ VMSTATE_INT32(read_pos, SyborgSerialState),
+ VMSTATE_INT32(read_count, SyborgSerialState),
+ VMSTATE_UINT32(dma_tx_ptr, SyborgSerialState),
+ VMSTATE_UINT32(dma_rx_ptr, SyborgSerialState),
+ VMSTATE_UINT32(dma_rx_size, SyborgSerialState),
+ VMSTATE_VARRAY_UINT32(read_fifo, SyborgSerialState, fifo_size, 1,
+ vmstate_info_uint32, uint32),
+ VMSTATE_END_OF_LIST()
}
-
- return 0;
-}
+};
static int syborg_serial_init(SysBusDevice *dev)
{
@@ -336,8 +313,6 @@ static int syborg_serial_init(SysBusDevice *dev)
}
s->read_fifo = qemu_mallocz(s->fifo_size * sizeof(s->read_fifo[0]));
- register_savevm(&dev->qdev, "syborg_serial", -1, 1,
- syborg_serial_save, syborg_serial_load, s);
return 0;
}
@@ -345,6 +320,7 @@ static SysBusDeviceInfo syborg_serial_info = {
.init = syborg_serial_init,
.qdev.name = "syborg,serial",
.qdev.size = sizeof(SyborgSerialState),
+ .qdev.vmsd = &vmstate_syborg_serial,
.qdev.props = (Property[]) {
DEFINE_PROP_UINT32("fifo-size", SyborgSerialState, fifo_size, 16),
DEFINE_PROP_END_OF_LIST(),
--
1.7.4
- Re: [Qemu-devel] [PATCH 58/58] vmstate: port mac_dbdma, (continued)
- [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, 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 <=
- [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
- [Qemu-devel] [PATCH 49/58] max111x: input field is only used as uint8_t, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 05/58] vmstate: add VMSTATE_INT64_ARRAY, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 43/58] vmstate: stellaris use unused for placeholder entries, Juan Quintela, 2011/02/24