[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/11] ide: add save/restore support for isa
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 08/11] ide: add save/restore support for isa |
Date: |
Wed, 26 Aug 2009 13:53:36 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/ide-isa.c | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/hw/ide-isa.c b/hw/ide-isa.c
index 705c24d..279474b 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);
}
--
1.6.2.5
- [Qemu-devel] [PATCH 00/11] ide: split + cleanup patches, Gerd Hoffmann, 2009/08/26
- [Qemu-devel] [PATCH 03/11] ide: split away ide-isa.c, Gerd Hoffmann, 2009/08/26
- [Qemu-devel] [PATCH 06/11] ide: split away ide-mmio.c, Gerd Hoffmann, 2009/08/26
- [Qemu-devel] [PATCH 04/11] ide: split away ide-pci.c, Gerd Hoffmann, 2009/08/26
- [Qemu-devel] [PATCH 02/11] ide: split away ide-internal.h, Gerd Hoffmann, 2009/08/26
- [Qemu-devel] [PATCH 08/11] ide: add save/restore support for isa,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 09/11] ide: add save/restore support for mmio, Gerd Hoffmann, 2009/08/26
- [Qemu-devel] [PATCH 05/11] ide: split away ide-macio.c, Gerd Hoffmann, 2009/08/26
- [Qemu-devel] [PATCH 01/11] ide: add IDEBus struct, cleanups, Gerd Hoffmann, 2009/08/26
- [Qemu-devel] [PATCH 10/11] ide: move code to hw/ide/, Gerd Hoffmann, 2009/08/26
- [Qemu-devel] [PATCH 11/11] ide: pass down DriveInfo instead of BlockDriverState, Gerd Hoffmann, 2009/08/26
- [Qemu-devel] [PATCH 07/11] ide: split away ide-microdrive.c, Gerd Hoffmann, 2009/08/26
- Re: [Qemu-devel] [PATCH 00/11] ide: split + cleanup patches, Anthony Liguori, 2009/08/27