From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=40237 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PAPC5-00084D-4n for qemu-devel@nongnu.org; Mon, 25 Oct 2010 11:42:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PAPC3-0005nf-OU for qemu-devel@nongnu.org; Mon, 25 Oct 2010 11:42:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28560) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PAPC3-0005nZ-HF for qemu-devel@nongnu.org; Mon, 25 Oct 2010 11:42:39 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9PFgbF2006102 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 25 Oct 2010 11:42:38 -0400 Date: Mon, 25 Oct 2010 17:42:36 +0200 From: Gleb Natapov Subject: Re: [Qemu-devel] [PATCH] initialize unit id of IDE bus Message-ID: <20101025154236.GH2343@redhat.com> References: <20101024162315.GG2343@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: qemu-devel@nongnu.org On Mon, Oct 25, 2010 at 04:29:35PM +0200, Markus Armbruster wrote: > Gleb Natapov writes: > > > Without this patch both buses on PIIX3_IDE device have the same unit id. > > Are you sure that's wrong? > So how do I know which bus is it on PIIX3_IDE? > As far as I can see, IDEBus member unit is the currently active unit, > set by write to port 6 (in ide_ioport_write()) and cleared on reset (in > ide_bus_reset()). > > > Signed-off-by: Gleb Natapov > > diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c > > index ff80dd5..b2cbdbc 100644 > > --- a/hw/ide/cmd646.c > > +++ b/hw/ide/cmd646.c > > @@ -257,8 +257,8 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev) > > pci_conf[PCI_INTERRUPT_PIN] = 0x01; // interrupt on pin 1 > > > > irq = qemu_allocate_irqs(cmd646_set_irq, d, 2); > > - ide_bus_new(&d->bus[0], &d->dev.qdev); > > - ide_bus_new(&d->bus[1], &d->dev.qdev); > > + ide_bus_new(&d->bus[0], &d->dev.qdev, 0); > > + ide_bus_new(&d->bus[1], &d->dev.qdev, 1); > > ide_init2(&d->bus[0], irq[0]); > > ide_init2(&d->bus[1], irq[1]); > > > > diff --git a/hw/ide/internal.h b/hw/ide/internal.h > > index 4165543..3da93df 100644 > > --- a/hw/ide/internal.h > > +++ b/hw/ide/internal.h > > @@ -564,7 +564,7 @@ void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0, > > void ide_init_ioport(IDEBus *bus, int iobase, int iobase2); > > > > /* hw/ide/qdev.c */ > > -void ide_bus_new(IDEBus *idebus, DeviceState *dev); > > +void ide_bus_new(IDEBus *idebus, DeviceState *dev, uint8_t unit); > > IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive); > > > > #endif /* HW_IDE_INTERNAL_H */ > > diff --git a/hw/ide/isa.c b/hw/ide/isa.c > > index 163ffba..907d862 100644 > > --- a/hw/ide/isa.c > > +++ b/hw/ide/isa.c > > @@ -67,7 +67,7 @@ static int isa_ide_initfn(ISADevice *dev) > > { > > ISAIDEState *s = DO_UPCAST(ISAIDEState, dev, dev); > > > > - ide_bus_new(&s->bus, &s->dev.qdev); > > + 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); > > diff --git a/hw/ide/piix.c b/hw/ide/piix.c > > index 07483e8..d0b04a3 100644 > > --- a/hw/ide/piix.c > > +++ b/hw/ide/piix.c > > @@ -129,8 +129,8 @@ static int pci_piix_ide_initfn(PCIIDEState *d) > > > > vmstate_register(&d->dev.qdev, 0, &vmstate_ide_pci, d); > > > > - ide_bus_new(&d->bus[0], &d->dev.qdev); > > - ide_bus_new(&d->bus[1], &d->dev.qdev); > > + ide_bus_new(&d->bus[0], &d->dev.qdev, 0); > > + ide_bus_new(&d->bus[1], &d->dev.qdev, 1); > > ide_init_ioport(&d->bus[0], 0x1f0, 0x3f6); > > ide_init_ioport(&d->bus[1], 0x170, 0x376); > > > > diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c > > index 0808760..1705a12 100644 > > --- a/hw/ide/qdev.c > > +++ b/hw/ide/qdev.c > > @@ -29,9 +29,10 @@ static struct BusInfo ide_bus_info = { > > .size = sizeof(IDEBus), > > }; > > > > -void ide_bus_new(IDEBus *idebus, DeviceState *dev) > > +void ide_bus_new(IDEBus *idebus, DeviceState *dev, uint8_t unit) > > { > > qbus_create_inplace(&idebus->qbus, &ide_bus_info, dev, NULL); > > + idebus->unit = unit; > > } > > > > static int ide_qdev_init(DeviceState *qdev, DeviceInfo *base) > > diff --git a/hw/ide/via.c b/hw/ide/via.c > > index b2c7cad..cc48b2b 100644 > > --- a/hw/ide/via.c > > +++ b/hw/ide/via.c > > @@ -158,8 +158,8 @@ static int vt82c686b_ide_initfn(PCIDevice *dev) > > > > vmstate_register(&dev->qdev, 0, &vmstate_ide_pci, d); > > > > - ide_bus_new(&d->bus[0], &d->dev.qdev); > > - ide_bus_new(&d->bus[1], &d->dev.qdev); > > + ide_bus_new(&d->bus[0], &d->dev.qdev, 0); > > + ide_bus_new(&d->bus[1], &d->dev.qdev, 1); > > ide_init2(&d->bus[0], isa_reserve_irq(14)); > > ide_init2(&d->bus[1], isa_reserve_irq(15)); > > ide_init_ioport(&d->bus[0], 0x1f0, 0x3f6); > > -- > > Gleb. -- Gleb.