From patchwork Wed Oct 14 11:37:50 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 35953 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 ozlabs.org (Postfix) with ESMTPS id 1764FB7B74 for ; Wed, 14 Oct 2009 22:56:57 +1100 (EST) Received: from localhost ([127.0.0.1]:37088 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1My2TN-0004tK-Mz for incoming@patchwork.ozlabs.org; Wed, 14 Oct 2009 07:56:53 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1My2Bi-0002Ng-As for qemu-devel@nongnu.org; Wed, 14 Oct 2009 07:38:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1My2Bc-0002IX-SY for qemu-devel@nongnu.org; Wed, 14 Oct 2009 07:38:36 -0400 Received: from [199.232.76.173] (port=41245 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1My2Bc-0002IH-OS for qemu-devel@nongnu.org; Wed, 14 Oct 2009 07:38:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36507) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1My2Bc-0006Do-AZ for qemu-devel@nongnu.org; Wed, 14 Oct 2009 07:38:32 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9EBcVMU007625 for ; Wed, 14 Oct 2009 07:38:31 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9EBcIF1006321; Wed, 14 Oct 2009 07:38:30 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 14 Oct 2009 13:37:50 +0200 Message-Id: <145e3481311e586ece18950fd5af58bcda0a7263.1255520033.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 10/13] ide: port isa ide to vmstate 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: Juan Quintela --- hw/ide/isa.c | 31 ++++++++++++------------------- 1 files changed, 12 insertions(+), 19 deletions(-) diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 9f0fdd6..fe67bcd 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -44,24 +44,17 @@ typedef struct ISAIDEState { qemu_irq irq; } 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; -} +static const VMStateDescription vmstate_ide_isa = { + .name = "isa-ide", + .version_id = 3, + .minimum_version_id = 0, + .minimum_version_id_old = 0, + .fields = (VMStateField []) { + VMSTATE_IDE_BUS(bus, ISAIDEState), + VMSTATE_IDE_DRIVES(bus.ifs, ISAIDEState), + VMSTATE_END_OF_LIST() + } +}; static int isa_ide_initfn(ISADevice *dev) { @@ -71,7 +64,7 @@ static int isa_ide_initfn(ISADevice *dev) ide_init_ioport(&s->bus, s->iobase, s->iobase2); isa_init_irq(dev, &s->irq, s->isairq); ide_init2(&s->bus, NULL, NULL, s->irq); - register_savevm("isa-ide", 0, 3, isa_ide_save, isa_ide_load, s); + vmstate_register(0, &vmstate_ide_isa, s); return 0; };