From patchwork Wed Aug 26 11:53:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 32138 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 1382BB70B3 for ; Wed, 26 Aug 2009 22:04:19 +1000 (EST) Received: from localhost ([127.0.0.1]:54342 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgHEb-0004e0-UQ for incoming@patchwork.ozlabs.org; Wed, 26 Aug 2009 08:04:13 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MgH4n-0001zJ-KJ for qemu-devel@nongnu.org; Wed, 26 Aug 2009 07:54:05 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MgH4j-0001wM-Ph for qemu-devel@nongnu.org; Wed, 26 Aug 2009 07:54:05 -0400 Received: from [199.232.76.173] (port=52130 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgH4j-0001wB-Kk for qemu-devel@nongnu.org; Wed, 26 Aug 2009 07:54:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28876) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MgH4j-00054x-4m for qemu-devel@nongnu.org; Wed, 26 Aug 2009 07:54:01 -0400 Received: from int-mx07.intmail.prod.int.phx2.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7QBs0Ew001761 for ; Wed, 26 Aug 2009 07:54:00 -0400 Received: from zweiblum.home.kraxel.org (vpn1-4-183.ams2.redhat.com [10.36.4.183]) by int-mx07.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n7QBrpgi029126; Wed, 26 Aug 2009 07:53:56 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 5AC14700E1; Wed, 26 Aug 2009 13:53:41 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 26 Aug 2009 13:53:36 +0200 Message-Id: <1251287619-20022-9-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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.20 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 08/11] ide: add save/restore support for isa X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann --- 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); }