Re: [Qemu-devel] [PATCH 58/58] vmstate: port mac_dbdma
On Thu, Feb 24, 2011 at 7:57 PM, Juan Quintela quint...@redhat.com wrote:
Signed-off-by: Juan Quintela quint...@redhat.com
---
hw/mac_dbdma.c | 46 ++
1 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/hw/mac_dbdma.c b/hw/mac_dbdma.c
index c108aee..3522552 100644
--- a/hw/mac_dbdma.c
+++ b/hw/mac_dbdma.c
@@ -810,30 +810,28 @@ static CPUReadMemoryFunc * const dbdma_read[] = {
dbdma_readl,
};
-static void dbdma_save(QEMUFile *f, void *opaque)
-{
- DBDMAState *s = opaque;
- unsigned int i, j;
-
- for (i = 0; i DBDMA_CHANNELS; i++)
- for (j = 0; j DBDMA_REGS; j++)
- qemu_put_be32s(f, s-channels[i].regs[j]);
-}
-
-static int dbdma_load(QEMUFile *f, void *opaque, int version_id)
-{
- DBDMAState *s = opaque;
- unsigned int i, j;
-
- if (version_id != 2)
- return -EINVAL;
Here the version ID was expected to be 2...
-
- for (i = 0; i DBDMA_CHANNELS; i++)
- for (j = 0; j DBDMA_REGS; j++)
- qemu_get_be32s(f, s-channels[i].regs[j]);
+static const VMStateDescription vmstate_dbdma_channel = {
+ .name = dbdma_channel,
+ .version_id = 0,
+ .minimum_version_id = 0,
+ .minimum_version_id_old = 0,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32_ARRAY(regs, struct DBDMA_channel, DBDMA_REGS),
+ VMSTATE_END_OF_LIST()
+ }
+};
- return 0;
-}
+static const VMStateDescription vmstate_dbdma = {
+ .name = dbdma,
+ .version_id = 1,
... while you now have 1 ...
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_STRUCT_ARRAY(channels, DBDMAState, DBDMA_CHANNELS, 1,
+ vmstate_dbdma_channel, DBDMA_channel),
+ VMSTATE_END_OF_LIST()
+ }
+};
static void dbdma_reset(void *opaque)
{
@@ -852,7 +850,7 @@ void* DBDMA_init (int *dbdma_mem_index)
*dbdma_mem_index = cpu_register_io_memory(dbdma_read, dbdma_write, s,
DEVICE_LITTLE_ENDIAN);
- register_savevm(NULL, dbdma, -1, 1, dbdma_save, dbdma_load, s);
... and here it was 1, which probably didn't work.
I'd still use 2.
[Qemu-devel] [PATCH 58/58] vmstate: port mac_dbdma
Signed-off-by: Juan Quintela quint...@redhat.com
---
hw/mac_dbdma.c | 46 ++
1 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/hw/mac_dbdma.c b/hw/mac_dbdma.c
index c108aee..3522552 100644
--- a/hw/mac_dbdma.c
+++ b/hw/mac_dbdma.c
@@ -810,30 +810,28 @@ static CPUReadMemoryFunc * const dbdma_read[] = {
dbdma_readl,
};
-static void dbdma_save(QEMUFile *f, void *opaque)
-{
-DBDMAState *s = opaque;
-unsigned int i, j;
-
-for (i = 0; i DBDMA_CHANNELS; i++)
-for (j = 0; j DBDMA_REGS; j++)
-qemu_put_be32s(f, s-channels[i].regs[j]);
-}
-
-static int dbdma_load(QEMUFile *f, void *opaque, int version_id)
-{
-DBDMAState *s = opaque;
-unsigned int i, j;
-
-if (version_id != 2)
-return -EINVAL;
-
-for (i = 0; i DBDMA_CHANNELS; i++)
-for (j = 0; j DBDMA_REGS; j++)
-qemu_get_be32s(f, s-channels[i].regs[j]);
+static const VMStateDescription vmstate_dbdma_channel = {
+.name = dbdma_channel,
+.version_id = 0,
+.minimum_version_id = 0,
+.minimum_version_id_old = 0,
+.fields = (VMStateField[]) {
+VMSTATE_UINT32_ARRAY(regs, struct DBDMA_channel, DBDMA_REGS),
+VMSTATE_END_OF_LIST()
+}
+};
-return 0;
-}
+static const VMStateDescription vmstate_dbdma = {
+.name = dbdma,
+.version_id = 1,
+.minimum_version_id = 1,
+.minimum_version_id_old = 1,
+.fields = (VMStateField[]) {
+VMSTATE_STRUCT_ARRAY(channels, DBDMAState, DBDMA_CHANNELS, 1,
+ vmstate_dbdma_channel, DBDMA_channel),
+VMSTATE_END_OF_LIST()
+}
+};
static void dbdma_reset(void *opaque)
{
@@ -852,7 +850,7 @@ void* DBDMA_init (int *dbdma_mem_index)
*dbdma_mem_index = cpu_register_io_memory(dbdma_read, dbdma_write, s,
DEVICE_LITTLE_ENDIAN);
-register_savevm(NULL, dbdma, -1, 1, dbdma_save, dbdma_load, s);
+vmstate_register(NULL, -1, vmstate_dbdma, s);
qemu_register_reset(dbdma_reset, s);
dbdma_bh = qemu_bh_new(DBDMA_run_bh, s);
--
1.7.4
