From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MgH4s-00022I-6J for qemu-devel@nongnu.org; Wed, 26 Aug 2009 07:54:10 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MgH4n-0001zN-Kh for qemu-devel@nongnu.org; Wed, 26 Aug 2009 07:54:09 -0400 Received: from [199.232.76.173] (port=52132 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgH4n-0001zF-Fo for qemu-devel@nongnu.org; Wed, 26 Aug 2009 07:54:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19750) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MgH4m-00055X-Mu for qemu-devel@nongnu.org; Wed, 26 Aug 2009 07:54:05 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7QBs3hT005274 for ; Wed, 26 Aug 2009 07:54:03 -0400 From: Gerd Hoffmann Date: Wed, 26 Aug 2009 13:53:37 +0200 Message-Id: <1251287619-20022-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1251287619-20022-1-git-send-email-kraxel@redhat.com> References: <1251287619-20022-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 09/11] ide: add save/restore support for mmio List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/ide-mmio.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/hw/ide-mmio.c b/hw/ide-mmio.c index 07b1ccf..ba43630 100644 --- a/hw/ide-mmio.c +++ b/hw/ide-mmio.c @@ -102,6 +102,25 @@ static CPUWriteMemoryFunc * const mmio_ide_cmd[] = { mmio_ide_cmd_write, }; +static void mmio_ide_save(QEMUFile* f, void *opaque) +{ + MMIOState *s = opaque; + + idebus_save(f, s->bus); + ide_save(f, &s->bus->ifs[0]); + ide_save(f, &s->bus->ifs[1]); +} + +static int mmio_ide_load(QEMUFile* f, void *opaque, int version_id) +{ + MMIOState *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 mmio_ide_init (target_phys_addr_t membase, target_phys_addr_t membase2, qemu_irq irq, int shift, BlockDriverState *hd0, BlockDriverState *hd1) @@ -119,5 +138,6 @@ void mmio_ide_init (target_phys_addr_t membase, target_phys_addr_t membase2, mem2 = cpu_register_io_memory(mmio_ide_status, mmio_ide_cmd, s); cpu_register_physical_memory(membase, 16 << shift, mem1); cpu_register_physical_memory(membase2, 2 << shift, mem2); + register_savevm("mmio-ide", 0, 3, mmio_ide_save, mmio_ide_load, s); } -- 1.6.2.5