From patchwork Sat Apr 27 20:18:38 2013 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: 240198 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 205872C00B0 for ; Sun, 28 Apr 2013 06:48:46 +1000 (EST) Received: from localhost ([::1]:42345 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWBcm-00041Q-1G for incoming@patchwork.ozlabs.org; Sat, 27 Apr 2013 16:21:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWBaW-0000XI-AP for qemu-devel@nongnu.org; Sat, 27 Apr 2013 16:19:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UWBaQ-00021b-NQ for qemu-devel@nongnu.org; Sat, 27 Apr 2013 16:19:16 -0400 Received: from cantor2.suse.de ([195.135.220.15]:41900 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWBaQ-00021L-E3 for qemu-devel@nongnu.org; Sat, 27 Apr 2013 16:19:10 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 884C25E00020B; Sat, 27 Apr 2013 22:19:09 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sat, 27 Apr 2013 22:18:38 +0200 Message-Id: <1367093935-29091-4-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1367093935-29091-1-git-send-email-afaerber@suse.de> References: <1367093935-29091-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Kevin Wolf , Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Stefan Hajnoczi , Markus Armbruster Subject: [Qemu-devel] [PATCH for-1.5 v2 03/20] fdc: QOM'ify ISA floppy controller 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 Introduce type constant and cast macro to obsolete DO_UPCAST(). Reuse type constant for PC machine compatibility settings. Prepares for ISA realizefn. Signed-off-by: Andreas Färber Cc: Markus Armbruster --- hw/block/fdc.c | 21 ++++++++++++--------- hw/i386/pc_piix.c | 2 +- include/hw/block/fdc.h | 2 ++ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index f1f1fd7..0888652 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -549,8 +549,11 @@ typedef struct FDCtrlSysBus { struct FDCtrl state; } FDCtrlSysBus; +#define ISA_FDC(obj) OBJECT_CHECK(FDCtrlISABus, (obj), TYPE_ISA_FDC) + typedef struct FDCtrlISABus { - ISADevice busdev; + ISADevice parent_obj; + uint32_t iobase; uint32_t irq; uint32_t dma; @@ -778,7 +781,7 @@ static void fdctrl_external_reset_sysbus(DeviceState *d) static void fdctrl_external_reset_isa(DeviceState *d) { - FDCtrlISABus *isa = container_of(d, FDCtrlISABus, busdev.qdev); + FDCtrlISABus *isa = ISA_FDC(d); FDCtrl *s = &isa->state; fdctrl_reset(s, 0); @@ -2021,7 +2024,7 @@ ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **fds) { ISADevice *dev; - dev = isa_try_create(bus, "isa-fdc"); + dev = isa_try_create(bus, TYPE_ISA_FDC); if (!dev) { return NULL; } @@ -2116,13 +2119,13 @@ static const MemoryRegionPortio fdc_portio_list[] = { static int isabus_fdc_init1(ISADevice *dev) { - FDCtrlISABus *isa = DO_UPCAST(FDCtrlISABus, busdev, dev); + FDCtrlISABus *isa = ISA_FDC(dev); FDCtrl *fdctrl = &isa->state; int ret; isa_register_portio_list(dev, isa->iobase, fdc_portio_list, fdctrl, "fdc"); - isa_init_irq(&isa->busdev, &fdctrl->irq, isa->irq); + isa_init_irq(dev, &fdctrl->irq, isa->irq); fdctrl->dma_chann = isa->dma; qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 2); @@ -2169,7 +2172,7 @@ static int sun4m_fdc_init1(SysBusDevice *dev) FDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i) { - FDCtrlISABus *isa = DO_UPCAST(FDCtrlISABus, busdev, fdc); + FDCtrlISABus *isa = ISA_FDC(fdc); return isa->state.drives[i].drive; } @@ -2197,7 +2200,7 @@ static Property isa_fdc_properties[] = { DEFINE_PROP_END_OF_LIST(), }; -static void isabus_fdc_class_init1(ObjectClass *klass, void *data) +static void isabus_fdc_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); @@ -2210,10 +2213,10 @@ static void isabus_fdc_class_init1(ObjectClass *klass, void *data) } static const TypeInfo isa_fdc_info = { - .name = "isa-fdc", + .name = TYPE_ISA_FDC, .parent = TYPE_ISA_DEVICE, .instance_size = sizeof(FDCtrlISABus), - .class_init = isabus_fdc_class_init1, + .class_init = isabus_fdc_class_init, }; static const VMStateDescription vmstate_sysbus_fdc ={ diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 89b4cb4..08dd61d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -458,7 +458,7 @@ static QEMUMachine pc_machine_v1_1 = { .property = "rom_only",\ .value = stringify(1),\ }, {\ - .driver = "isa-fdc",\ + .driver = TYPE_ISA_FDC,\ .property = "check_media_rate",\ .value = "off",\ }, {\ diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index a8f6f7c..d48b2f8 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -13,6 +13,8 @@ typedef enum FDriveType { FDRIVE_DRV_NONE = 0x03, /* No drive connected */ } FDriveType; +#define TYPE_ISA_FDC "isa-fdc" + ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **fds); void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, hwaddr mmio_base, DriveInfo **fds);