[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/13] ide: port isa ide to vmstate
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 10/13] ide: port isa ide to vmstate |
Date: |
Wed, 14 Oct 2009 13:37:50 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/ide/isa.c | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index 9f0fdd6..fe67bcd 100644
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -44,24 +44,17 @@ typedef struct ISAIDEState {
qemu_irq irq;
} ISAIDEState;
-static void isa_ide_save(QEMUFile* f, void *opaque)
-{
- ISAIDEState *s = opaque;
-
- idebus_save(f, &s->bus);
- ide_save(f, &s->bus.ifs[0]);
- ide_save(f, &s->bus.ifs[1]);
-}
-
-static int isa_ide_load(QEMUFile* f, void *opaque, int version_id)
-{
- ISAIDEState *s = opaque;
-
- idebus_load(f, &s->bus, version_id);
- ide_load(f, &s->bus.ifs[0], version_id);
- ide_load(f, &s->bus.ifs[1], version_id);
- return 0;
-}
+static const VMStateDescription vmstate_ide_isa = {
+ .name = "isa-ide",
+ .version_id = 3,
+ .minimum_version_id = 0,
+ .minimum_version_id_old = 0,
+ .fields = (VMStateField []) {
+ VMSTATE_IDE_BUS(bus, ISAIDEState),
+ VMSTATE_IDE_DRIVES(bus.ifs, ISAIDEState),
+ VMSTATE_END_OF_LIST()
+ }
+};
static int isa_ide_initfn(ISADevice *dev)
{
@@ -71,7 +64,7 @@ static int isa_ide_initfn(ISADevice *dev)
ide_init_ioport(&s->bus, s->iobase, s->iobase2);
isa_init_irq(dev, &s->irq, s->isairq);
ide_init2(&s->bus, NULL, NULL, s->irq);
- register_savevm("isa-ide", 0, 3, isa_ide_save, isa_ide_load, s);
+ vmstate_register(0, &vmstate_ide_isa, s);
return 0;
};
--
1.6.2.5
- [Qemu-devel] [PATCH 00/13] Port ide to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 01/13] ide: port idebus to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 02/13] ide: change identify_data type to uint8_t, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 03/13] vmstate: add VMSTATE_BUFFER_TEST, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 06/13] ide: add VMSTATE_IDE_BUS and VMSTATE_IDE_DRIVES, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 05/13] ide: microdrive cycle field is set as uint8_t, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 04/13] ide: port ide_drive to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 08/13] ide: include bus in MMIOState, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 09/13] ide: port ide mmio to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 07/13] ide: port microdrive to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 10/13] ide: port isa ide to vmstate,
Juan Quintela <=
- [Qemu-devel] [PATCH 12/13] ide: port pci ide to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 13/13] ide: pre VMState functions are not needed anymore, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 11/13] ide: port pmac ide to vmstate, Juan Quintela, 2009/10/14