From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:42043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUNue-0006Ml-IR for qemu-devel@nongnu.org; Wed, 08 Jun 2011 14:55:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QUNua-00069u-WA for qemu-devel@nongnu.org; Wed, 08 Jun 2011 14:55:32 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:36137) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUNuZ-000697-J4 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:16 +0200 Message-Id: <1307559319-16183-10-git-send-email-andreas.faerber@web.de> In-Reply-To: <1307559319-16183-9-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> 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 09/12] fdc: 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/fdc.c | 47 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 34 insertions(+), 13 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index f4e3e0d..e2dcff0 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1894,25 +1894,43 @@ static int fdctrl_init_common(FDCtrl *fdctrl) return fdctrl_connect_drives(fdctrl); } =20 +static int isabus_fdc_set_state(ISADevice *dev, bool enabled) +{ + FDCtrlISABus *isa =3D DO_UPCAST(FDCtrlISABus, busdev, dev); + FDCtrl *fdctrl =3D &isa->state; + + if (enabled) { + register_ioport_read(isa->iobase + 0x01, 5, 1, + &fdctrl_read_port, fdctrl); + register_ioport_read(isa->iobase + 0x07, 1, 1, + &fdctrl_read_port, fdctrl); + register_ioport_write(isa->iobase + 0x01, 5, 1, + &fdctrl_write_port, fdctrl); + register_ioport_write(isa->iobase + 0x07, 1, 1, + &fdctrl_write_port, fdctrl); + isa_init_ioport_range(dev, isa->iobase, 6); + isa_init_ioport(dev, isa->iobase + 7); + + isa_init_irq(&isa->busdev, &fdctrl->irq, isa->irq); + } else { + isa_discard_ioport_range(dev, isa->iobase + 0x07, 1); + isa_discard_ioport_range(dev, isa->iobase + 0x01, 5); + isa_unassign_ioport(isa->iobase + 7, 1); + isa_unassign_ioport(isa->iobase, 6); + =20 + isa_discard_irq(&isa->busdev, isa->irq); + } + return 0; +} + static int isabus_fdc_init1(ISADevice *dev) { FDCtrlISABus *isa =3D DO_UPCAST(FDCtrlISABus, busdev, dev); FDCtrl *fdctrl =3D &isa->state; int ret; =20 - register_ioport_read(isa->iobase + 0x01, 5, 1, - &fdctrl_read_port, fdctrl); - register_ioport_read(isa->iobase + 0x07, 1, 1, - &fdctrl_read_port, fdctrl); - register_ioport_write(isa->iobase + 0x01, 5, 1, - &fdctrl_write_port, fdctrl); - register_ioport_write(isa->iobase + 0x07, 1, 1, - &fdctrl_write_port, fdctrl); - isa_init_ioport_range(dev, isa->iobase, 6); - isa_init_ioport(dev, isa->iobase + 7); - - isa_init_irq(&isa->busdev, &fdctrl->irq, isa->irq); fdctrl->dma_chann =3D isa->dma; + isabus_fdc_set_state(dev, true); =20 qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 2); ret =3D fdctrl_init_common(fdctrl); @@ -1962,9 +1980,10 @@ static int sun4m_fdc_init1(SysBusDevice *dev) =20 static const VMStateDescription vmstate_isa_fdc =3D{ .name =3D "fdc", - .version_id =3D 2, + .version_id =3D 3, .minimum_version_id =3D 2, .fields =3D (VMStateField []) { + VMSTATE_ISA_DEVICE_V(busdev, FDCtrlISABus, 3), VMSTATE_STRUCT(state, FDCtrlISABus, 0, vmstate_fdc, FDCtrl), VMSTATE_END_OF_LIST() } @@ -1972,6 +1991,7 @@ static const VMStateDescription vmstate_isa_fdc =3D= { =20 static ISADeviceInfo isa_fdc_info =3D { .init =3D isabus_fdc_init1, + .set_state =3D isabus_fdc_set_state, .qdev.name =3D "isa-fdc", .qdev.fw_name =3D "fdc", .qdev.size =3D sizeof(FDCtrlISABus), @@ -1986,6 +2006,7 @@ static ISADeviceInfo isa_fdc_info =3D { DEFINE_PROP_DRIVE("driveB", FDCtrlISABus, state.drives[1].bs), DEFINE_PROP_INT32("bootindexA", FDCtrlISABus, bootindexA, -1), DEFINE_PROP_INT32("bootindexB", FDCtrlISABus, bootindexB, -1), + DEFINE_PROP_BOOL("enabled", FDCtrlISABus, busdev.enabled, true), DEFINE_PROP_END_OF_LIST(), }, }; --=20 1.7.5.3