From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mm5JS-0004Rh-3G for qemu-devel@nongnu.org; Fri, 11 Sep 2009 08:33:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mm5JN-0004MN-R2 for qemu-devel@nongnu.org; Fri, 11 Sep 2009 08:33:13 -0400 Received: from [199.232.76.173] (port=49298 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mm5JN-0004LB-9g for qemu-devel@nongnu.org; Fri, 11 Sep 2009 08:33:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20861) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mm5JM-00047q-L8 for qemu-devel@nongnu.org; Fri, 11 Sep 2009 08:33:08 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8BCX89f016736 for ; Fri, 11 Sep 2009 08:33:08 -0400 From: Gerd Hoffmann Date: Fri, 11 Sep 2009 14:32:29 +0200 Message-Id: <1252672351-12937-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1252672351-12937-1-git-send-email-kraxel@redhat.com> References: <1252672351-12937-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 6/8] ide/isa: convert to qdev. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/ide.h | 4 +- hw/ide/isa.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++------- hw/mips_r4k.c | 2 +- hw/pc.c | 3 +- hw/ppc_prep.c | 2 +- 5 files changed, 58 insertions(+), 14 deletions(-) diff --git a/hw/ide.h b/hw/ide.h index e0a508b..0e7d540 100644 --- a/hw/ide.h +++ b/hw/ide.h @@ -4,8 +4,8 @@ #include "qdev.h" /* ide-isa.c */ -void isa_ide_init(int iobase, int iobase2, qemu_irq irq, - DriveInfo *hd0, DriveInfo *hd1); +int isa_ide_init(int iobase, int iobase2, int isairq, + DriveInfo *hd0, DriveInfo *hd1); /* ide-pci.c */ void pci_cmd646_ide_init(PCIBus *bus, DriveInfo **hd_table, diff --git a/hw/ide/isa.c b/hw/ide/isa.c index ec2d6fb..d2fe0c0 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -24,6 +24,7 @@ */ #include #include +#include #include "block.h" #include "block_int.h" #include "sysemu.h" @@ -35,7 +36,12 @@ /* ISA IDE definitions */ typedef struct ISAIDEState { - IDEBus *bus; + ISADevice dev; + IDEBus *bus; + uint32_t iobase; + uint32_t iobase2; + uint32_t isairq; + qemu_irq irq; } ISAIDEState; static void isa_ide_save(QEMUFile* f, void *opaque) @@ -57,15 +63,54 @@ static int isa_ide_load(QEMUFile* f, void *opaque, int version_id) return 0; } -void isa_ide_init(int iobase, int iobase2, qemu_irq irq, - DriveInfo *hd0, DriveInfo *hd1) +static int isa_ide_initfn(ISADevice *dev) { + ISAIDEState *s = DO_UPCAST(ISAIDEState, dev, dev); + + s->bus = ide_bus_new(&s->dev.qdev); + ide_init_ioport(s->bus, s->iobase, s->iobase2); + isa_init_irq(dev, &s->irq, s->isairq); + ide_init2(s->bus, NULL, NULL, s->irq); + register_savevm("isa-ide", 0, 3, isa_ide_save, isa_ide_load, s); + return 0; +}; + +int isa_ide_init(int iobase, int iobase2, int isairq, + DriveInfo *hd0, DriveInfo *hd1) +{ + ISADevice *dev; ISAIDEState *s; - s = qemu_mallocz(sizeof(*s)); - s->bus = qemu_mallocz(sizeof(IDEBus)); + dev = isa_create("isa-ide"); + qdev_prop_set_uint32(&dev->qdev, "iobase", iobase); + qdev_prop_set_uint32(&dev->qdev, "iobase2", iobase2); + qdev_prop_set_uint32(&dev->qdev, "irq", isairq); + if (qdev_init(&dev->qdev) != 0) + return -1; - ide_init2(s->bus, hd0, hd1, irq); - ide_init_ioport(s->bus, iobase, iobase2); - register_savevm("isa-ide", 0, 3, isa_ide_save, isa_ide_load, s); + s = DO_UPCAST(ISAIDEState, dev, dev); + if (hd0) + ide_create_drive(s->bus, 0, hd0); + if (hd1) + ide_create_drive(s->bus, 1, hd1); + return 0; +} + +static ISADeviceInfo isa_ide_info = { + .qdev.name = "isa-ide", + .qdev.size = sizeof(ISAIDEState), + .init = isa_ide_initfn, + .qdev.props = (Property[]) { + DEFINE_PROP_HEX32("iobase", ISAIDEState, iobase, 0x1f0), + DEFINE_PROP_HEX32("iobase2", ISAIDEState, iobase2, 0x3f6), + DEFINE_PROP_UINT32("irq", ISAIDEState, isairq, 14), + DEFINE_PROP_END_OF_LIST(), + }, +}; + +static void isa_ide_register_devices(void) +{ + isa_qdev_register(&isa_ide_info); } + +device_init(isa_ide_register_devices) diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index d801417..fcc7fed 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -274,7 +274,7 @@ void mips_r4k_init (ram_addr_t ram_size, } for(i = 0; i < MAX_IDE_BUS; i++) - isa_ide_init(ide_iobase[i], ide_iobase2[i], i8259[ide_irq[i]], + isa_ide_init(ide_iobase[i], ide_iobase2[i], ide_irq[i], hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]); diff --git a/hw/pc.c b/hw/pc.c index d96d756..96907b2 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1367,8 +1367,7 @@ static void pc_init1(ram_addr_t ram_size, pci_piix3_ide_init(pci_bus, hd, piix3_devfn + 1); } else { for(i = 0; i < MAX_IDE_BUS; i++) { - isa_ide_init(ide_iobase[i], ide_iobase2[i], - isa_reserve_irq(ide_irq[i]), + isa_ide_init(ide_iobase[i], ide_iobase2[i], ide_irq[i], hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]); } } diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 1930146..6001c86 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -707,7 +707,7 @@ static void ppc_prep_init (ram_addr_t ram_size, } for(i = 0; i < MAX_IDE_BUS; i++) { - isa_ide_init(ide_iobase[i], ide_iobase2[i], i8259[ide_irq[i]], + isa_ide_init(ide_iobase[i], ide_iobase2[i], ide_irq[i], hd[2 * i], hd[2 * i + 1]); } -- 1.6.2.5