[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 50/58] vmstate: port max111x
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 50/58] vmstate: port max111x |
Date: |
Thu, 24 Feb 2011 18:57:47 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/max111x.c | 49 +++++++++++++++++--------------------------------
1 files changed, 17 insertions(+), 32 deletions(-)
diff --git a/hw/max111x.c b/hw/max111x.c
index 3adc3e4..eca117e 100644
--- a/hw/max111x.c
+++ b/hw/max111x.c
@@ -94,36 +94,22 @@ static uint32_t max111x_transfer(SSISlave *dev, uint32_t
value)
return max111x_read(s);
}
-static void max111x_save(QEMUFile *f, void *opaque)
-{
- MAX111xState *s = (MAX111xState *) opaque;
- int i;
-
- qemu_put_8s(f, &s->tb1);
- qemu_put_8s(f, &s->rb2);
- qemu_put_8s(f, &s->rb3);
- qemu_put_be32(f, s->inputs);
- qemu_put_be32(f, s->com);
- for (i = 0; i < s->inputs; i ++)
- qemu_put_byte(f, s->input[i]);
-}
-
-static int max111x_load(QEMUFile *f, void *opaque, int version_id)
-{
- MAX111xState *s = (MAX111xState *) opaque;
- int i;
-
- qemu_get_8s(f, &s->tb1);
- qemu_get_8s(f, &s->rb2);
- qemu_get_8s(f, &s->rb3);
- if (s->inputs != qemu_get_be32(f))
- return -EINVAL;
- s->com = qemu_get_be32(f);
- for (i = 0; i < s->inputs; i ++)
- s->input[i] = qemu_get_byte(f);
-
- return 0;
-}
+static const VMStateDescription vmstate_max111x = {
+ .name = "max111x",
+ .version_id = 0,
+ .minimum_version_id = 0,
+ .minimum_version_id_old = 0,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT8(tb1, MAX111xState),
+ VMSTATE_UINT8(rb2, MAX111xState),
+ VMSTATE_UINT8(rb3, MAX111xState),
+ VMSTATE_INT32(inputs, MAX111xState),
+ VMSTATE_INT32(com, MAX111xState),
+ VMSTATE_ARRAY_INT32_UNSAFE(input, MAX111xState, inputs,
+ vmstate_info_uint8, uint8_t),
+ VMSTATE_END_OF_LIST()
+ }
+};
static int max111x_init(SSISlave *dev, int inputs)
{
@@ -143,8 +129,7 @@ static int max111x_init(SSISlave *dev, int inputs)
s->input[7] = 0x80;
s->com = 0;
- register_savevm(&dev->qdev, "max111x", -1, 0,
- max111x_save, max111x_load, s);
+ vmstate_register(&dev->qdev, -1, &vmstate_max111x, s);
return 0;
}
--
1.7.4
- [Qemu-devel] [PATCH 57/58] mac_dbdma: create DBDMAState instead of passing one array around, (continued)
- [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, 2011/02/24
- [Qemu-devel] [PATCH 50/58] vmstate: port max111x,
Juan Quintela <=
- [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
- [Qemu-devel] [PATCH 49/58] max111x: input field is only used as uint8_t, Juan Quintela, 2011/02/24