From patchwork Wed Jun 8 18:55:16 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: 99540 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 CE06FB6FDD for ; Thu, 9 Jun 2011 05:20:25 +1000 (EST) Received: from localhost ([::1]:58376 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUOIf-0003kH-7q for incoming@patchwork.ozlabs.org; Wed, 08 Jun 2011 15:20:21 -0400 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 Received: from smtp01.web.de ( [172.20.0.243]) by fmmailgate03.web.de (Postfix) with ESMTP id A734D191FD273; Wed, 8 Jun 2011 20:55:26 +0200 (CEST) Received: from [87.173.123.15] (helo=af.local) by smtp01.web.de with asmtp (WEB.DE 4.110 #2) id 1QUNuY-0002zl-00; Wed, 08 Jun 2011 20:55:26 +0200 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Wed, 8 Jun 2011 20:55:16 +0200 Message-Id: <1307559319-16183-10-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.5.3 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 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX1+T+puRyGv/CXmaxBV/poFBsJoXWC3G8RqUmXMX WVHfLswSuJSatBFPmgl0pJk1mV0JZ7j9QuEFfWZfV0KNdxyeLD qfHSk5rvXtZbdqaJEfbw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.234 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , hpoussin@reactos.org, kraxel@redhat.com Subject: [Qemu-devel] [RFC v4 09/12] fdc: 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/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); } +static int isabus_fdc_set_state(ISADevice *dev, bool enabled) +{ + FDCtrlISABus *isa = DO_UPCAST(FDCtrlISABus, busdev, dev); + FDCtrl *fdctrl = &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); + + isa_discard_irq(&isa->busdev, isa->irq); + } + return 0; +} + static int isabus_fdc_init1(ISADevice *dev) { FDCtrlISABus *isa = DO_UPCAST(FDCtrlISABus, busdev, dev); FDCtrl *fdctrl = &isa->state; int ret; - 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 = isa->dma; + isabus_fdc_set_state(dev, true); qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 2); ret = fdctrl_init_common(fdctrl); @@ -1962,9 +1980,10 @@ static int sun4m_fdc_init1(SysBusDevice *dev) static const VMStateDescription vmstate_isa_fdc ={ .name = "fdc", - .version_id = 2, + .version_id = 3, .minimum_version_id = 2, .fields = (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 ={ static ISADeviceInfo isa_fdc_info = { .init = isabus_fdc_init1, + .set_state = isabus_fdc_set_state, .qdev.name = "isa-fdc", .qdev.fw_name = "fdc", .qdev.size = sizeof(FDCtrlISABus), @@ -1986,6 +2006,7 @@ static ISADeviceInfo isa_fdc_info = { 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(), }, };