[Qemu-devel] [PATCH 3/8] ide: add save/restore support for isa

[Gerd Hoffmann <kraxel@redhat.com>]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/ide-internal.h |    5 +++++
 hw/ide-isa.c      |   33 +++++++++++++++++++++++++++++----
 hw/ide.c          |    8 ++++----
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/hw/ide-internal.h b/hw/ide-internal.h
index c2ccb11..d4a4947 100644
--- a/hw/ide-internal.h
+++ b/hw/ide-internal.h
@@ -90,6 +90,11 @@ static inline IDEState *idebus_active_if(IDEBus *bus)
 }
 
 /* ide.c */
+void ide_save(QEMUFile* f, IDEState *s);
+void ide_load(QEMUFile* f, IDEState *s, int version_id);
+void idebus_save(QEMUFile* f, IDEBus *bus);
+void idebus_load(QEMUFile* f, IDEBus *bus, int version_id);
+
 void ide_init2(IDEBus *bus, BlockDriverState *hd0, BlockDriverState *hd1,
                qemu_irq irq);
 void ide_init_ioport(IDEBus *bus, int iobase, int iobase2);
diff --git a/hw/ide-isa.c b/hw/ide-isa.c
index 2d65825..38ba6f9 100644
--- a/hw/ide-isa.c
+++ b/hw/ide-isa.c
@@ -33,13 +33,38 @@
 /***********************************************************/
 /* ISA IDE definitions */
 
+typedef struct ISAIDEState {
+    IDEBus *bus;
+} 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;
+}
+
 void isa_ide_init(int iobase, int iobase2, qemu_irq irq,
                   BlockDriverState *hd0, BlockDriverState *hd1)
 {
-    IDEBus *bus;
+    ISAIDEState *s;
 
-    bus = qemu_mallocz(sizeof(*bus));
+    s = qemu_mallocz(sizeof(*s));
+    s->bus = qemu_mallocz(sizeof(IDEBus));
 
-    ide_init2(bus, hd0, hd1, irq);
-    ide_init_ioport(bus, iobase, iobase2);
+    ide_init2(s->bus, hd0, hd1, irq);
+    ide_init_ioport(s->bus, iobase, iobase2);
+    register_savevm("isa-ide", 0, 3, isa_ide_save, isa_ide_load, s);
 }
diff --git a/hw/ide.c b/hw/ide.c
index 879196e..5fb42b7 100644
--- a/hw/ide.c
+++ b/hw/ide.c
@@ -2800,7 +2800,7 @@ void ide_init_ioport(IDEBus *bus, int iobase, int iobase2)
 }
 
 /* save per IDE drive data */
-static void ide_save(QEMUFile* f, IDEState *s)
+void ide_save(QEMUFile* f, IDEState *s)
 {
     qemu_put_be32(f, s->mult_sectors);
     qemu_put_be32(f, s->identify_set);
@@ -2829,7 +2829,7 @@ static void ide_save(QEMUFile* f, IDEState *s)
 }
 
 /* load per IDE drive data */
-static void ide_load(QEMUFile* f, IDEState *s, int version_id)
+void ide_load(QEMUFile* f, IDEState *s, int version_id)
 {
     s->mult_sectors=qemu_get_be32(f);
     s->identify_set=qemu_get_be32(f);
@@ -2863,14 +2863,14 @@ static void ide_load(QEMUFile* f, IDEState *s, int version_id)
     /* XXX: if a transfer is pending, we do not save it yet */
 }
 
-static void idebus_save(QEMUFile* f, IDEBus *bus)
+void idebus_save(QEMUFile* f, IDEBus *bus)
 {
     IDEState *s = idebus_active_if(bus);
     qemu_put_8s(f, &s->cmd);
     qemu_put_8s(f, &bus->unit);
 }
 
-static void idebus_load(QEMUFile* f, IDEBus *bus, int version_id)
+void idebus_load(QEMUFile* f, IDEBus *bus, int version_id)
 {
     IDEState *s;
     uint8_t cmd;
-- 
1.6.2.5