From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 8 Jun 2011 20:55:18 +0200 Message-Id: <1307559319-16183-12-git-send-email-andreas.faerber@web.de> 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 Content-Type: text/plain; charset=UTF-8 Sender: andreas.faerber@web.de Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [RFC v4 11/12] ide: Implement ISA set_state() callback List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , hpoussin@reactos.org, kraxel@redhat.com Incorporate ISA VMState. Add "enabled" property. Signed-off-by: Andreas F=C3=A4rber --- 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) =20 static const VMStateDescription vmstate_ide_isa =3D { .name =3D "isa-ide", - .version_id =3D 3, + .version_id =3D 4, .minimum_version_id =3D 0, .minimum_version_id_old =3D 0, .fields =3D (VMStateField []) { + VMSTATE_ISA_DEVICE_V(dev, ISAIDEState, 4), VMSTATE_IDE_BUS(bus, ISAIDEState), VMSTATE_IDE_DRIVES(bus.ifs, ISAIDEState), VMSTATE_END_OF_LIST() } }; =20 +static int isa_ide_statefn(ISADevice *dev, bool enabled) +{ + ISAIDEState *s =3D 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 =3D DO_UPCAST(ISAIDEState, dev, dev); =20 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 =3D { .qdev.fw_name =3D "ide", .qdev.size =3D sizeof(ISAIDEState), .init =3D isa_ide_initfn, + .set_state =3D isa_ide_statefn, .qdev.reset =3D isa_ide_reset, .qdev.props =3D (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(), }, }; --=20 1.7.5.3