From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Me7bh-0006s7-VS for qemu-devel@nongnu.org; Thu, 20 Aug 2009 09:23:10 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Me7bc-0006q3-6Q for qemu-devel@nongnu.org; Thu, 20 Aug 2009 09:23:08 -0400 Received: from [199.232.76.173] (port=34899 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Me7bc-0006pz-1w for qemu-devel@nongnu.org; Thu, 20 Aug 2009 09:23:04 -0400 Received: from mx20.gnu.org ([199.232.41.8]:42822) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Me7bb-0001Dc-Fm for qemu-devel@nongnu.org; Thu, 20 Aug 2009 09:23:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Me7ba-0003Bi-BE for qemu-devel@nongnu.org; Thu, 20 Aug 2009 09:23:02 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7KDN19N010067 for ; Thu, 20 Aug 2009 09:23:01 -0400 From: Gerd Hoffmann Date: Thu, 20 Aug 2009 15:22:25 +0200 Message-Id: <1250774546-18951-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1250774546-18951-1-git-send-email-kraxel@redhat.com> References: <1250774546-18951-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 09/10] 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 e76c5ec..6df0da0 100644 --- a/hw/ide-mmio.c +++ b/hw/ide-mmio.c @@ -102,6 +102,25 @@ static CPUWriteMemoryFunc *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