From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49171) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTxoU-0001iQ-EP for qemu-devel@nongnu.org; Tue, 07 Jun 2011 11:03:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTxoA-0000QX-9u for qemu-devel@nongnu.org; Tue, 07 Jun 2011 11:03:24 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:46739) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTxo9-0000Pz-QF for qemu-devel@nongnu.org; Tue, 07 Jun 2011 11:03:06 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 7 Jun 2011 17:02:57 +0200 Message-Id: <1307458978-51287-10-git-send-email-andreas.faerber@web.de> In-Reply-To: <1307458978-51287-9-git-send-email-andreas.faerber@web.de> References: <4DEDD0BA.1080407@redhat.com> <1307458978-51287-1-git-send-email-andreas.faerber@web.de> <1307458978-51287-2-git-send-email-andreas.faerber@web.de> <1307458978-51287-3-git-send-email-andreas.faerber@web.de> <1307458978-51287-4-git-send-email-andreas.faerber@web.de> <1307458978-51287-5-git-send-email-andreas.faerber@web.de> <1307458978-51287-6-git-send-email-andreas.faerber@web.de> <1307458978-51287-7-git-send-email-andreas.faerber@web.de> <1307458978-51287-8-git-send-email-andreas.faerber@web.de> <1307458978-51287-9-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 v2 09/10] 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 Signed-off-by: Andreas F=C3=A4rber --- hw/ide/isa.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 4ac7453..e6ee263 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -62,15 +62,33 @@ static const VMStateDescription vmstate_ide_isa =3D { } }; =20 +static void 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); + } +} + 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,6 +120,7 @@ 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), --=20 1.7.5.3