From patchwork Wed Jun 8 18:55:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 99554 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0C952B6FD0 for ; Thu, 9 Jun 2011 06:42:53 +1000 (EST) Received: from localhost ([::1]:60491 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUPaT-0001u7-Db for incoming@patchwork.ozlabs.org; Wed, 08 Jun 2011 16:42:49 -0400 Received: from eggs.gnu.org ([140.186.70.92]:42031) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUNud-0006MZ-Ri for qemu-devel@nongnu.org; Wed, 08 Jun 2011 14:55:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QUNua-00069l-Uh for qemu-devel@nongnu.org; Wed, 08 Jun 2011 14:55:31 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:37261) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUNua-00068S-5L for qemu-devel@nongnu.org; Wed, 08 Jun 2011 14:55:28 -0400 Received: from smtp01.web.de ( [172.20.0.243]) by fmmailgate01.web.de (Postfix) with ESMTP id B809419158932; Wed, 8 Jun 2011 20:55:27 +0200 (CEST) Received: from [87.173.123.15] (helo=af.local) by smtp01.web.de with asmtp (WEB.DE 4.110 #2) id 1QUNuZ-0002zl-00; Wed, 08 Jun 2011 20:55:27 +0200 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Wed, 8 Jun 2011 20:55:18 +0200 Message-Id: <1307559319-16183-12-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.5.3 In-Reply-To: <1307559319-16183-11-git-send-email-andreas.faerber@web.de> References: <4DEF2F25.5070104@redhat.com> <1307559319-16183-1-git-send-email-andreas.faerber@web.de> <1307559319-16183-2-git-send-email-andreas.faerber@web.de> <1307559319-16183-3-git-send-email-andreas.faerber@web.de> <1307559319-16183-4-git-send-email-andreas.faerber@web.de> <1307559319-16183-5-git-send-email-andreas.faerber@web.de> <1307559319-16183-6-git-send-email-andreas.faerber@web.de> <1307559319-16183-7-git-send-email-andreas.faerber@web.de> <1307559319-16183-8-git-send-email-andreas.faerber@web.de> <1307559319-16183-9-git-send-email-andreas.faerber@web.de> <1307559319-16183-10-git-send-email-andreas.faerber@web.de> <1307559319-16183-11-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX1/Q+0slHKGeUdzwrQIyKPWr56DR0W2pyD7r3FMW l0uAbb3kPGM0+VtDW9zcymzPjoaNk+VmyafrzKEH+2ng7u3REd utC7YLVx6+x4cl+RGT2w== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.221 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , hpoussin@reactos.org, kraxel@redhat.com Subject: [Qemu-devel] [RFC v4 11/12] ide: Implement ISA set_state() callback X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Incorporate ISA VMState. Add "enabled" property. Signed-off-by: Andreas Färber --- hw/ide/isa.c | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 4ac7453..fd5c55e 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -52,25 +52,45 @@ static void isa_ide_reset(DeviceState *d) static const VMStateDescription vmstate_ide_isa = { .name = "isa-ide", - .version_id = 3, + .version_id = 4, .minimum_version_id = 0, .minimum_version_id_old = 0, .fields = (VMStateField []) { + VMSTATE_ISA_DEVICE_V(dev, ISAIDEState, 4), VMSTATE_IDE_BUS(bus, ISAIDEState), VMSTATE_IDE_DRIVES(bus.ifs, ISAIDEState), VMSTATE_END_OF_LIST() } }; +static int isa_ide_statefn(ISADevice *dev, bool enabled) +{ + ISAIDEState *s = DO_UPCAST(ISAIDEState, dev, dev); + + if (enabled) { + ide_init_ioport(&s->bus, s->iobase, s->iobase2); + + isa_init_ioport_range(dev, s->iobase, 8); + isa_init_ioport(dev, s->iobase2); + + isa_init_irq(dev, &s->irq, s->isairq); + } else { + ide_discard_ioport(s->iobase, s->iobase2); + + isa_discard_ioport_range(dev, s->iobase2, 1); + isa_discard_ioport_range(dev, s->iobase, 8); + + isa_discard_irq(dev, s->isairq); + } + return 0; +} + static int isa_ide_initfn(ISADevice *dev) { ISAIDEState *s = DO_UPCAST(ISAIDEState, dev, dev); ide_bus_new(&s->bus, &s->dev.qdev, 0); - ide_init_ioport(&s->bus, s->iobase, s->iobase2); - isa_init_irq(dev, &s->irq, s->isairq); - isa_init_ioport_range(dev, s->iobase, 8); - isa_init_ioport(dev, s->iobase2); + isa_ide_statefn(dev, true); ide_init2(&s->bus, s->irq); vmstate_register(&dev->qdev, 0, &vmstate_ide_isa, s); return 0; @@ -102,11 +122,13 @@ static ISADeviceInfo isa_ide_info = { .qdev.fw_name = "ide", .qdev.size = sizeof(ISAIDEState), .init = isa_ide_initfn, + .set_state = isa_ide_statefn, .qdev.reset = isa_ide_reset, .qdev.props = (Property[]) { DEFINE_PROP_HEX32("iobase", ISAIDEState, iobase, 0x1f0), DEFINE_PROP_HEX32("iobase2", ISAIDEState, iobase2, 0x3f6), DEFINE_PROP_UINT32("irq", ISAIDEState, isairq, 14), + DEFINE_PROP_BOOL("enabled", ISAIDEState, dev.enabled, true), DEFINE_PROP_END_OF_LIST(), }, };