From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51663) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZMon-00020Y-Qq for qemu-devel@nongnu.org; Mon, 06 May 2013 10:55:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UZMoj-0006is-01 for qemu-devel@nongnu.org; Mon, 06 May 2013 10:55:09 -0400 Received: from cantor2.suse.de ([195.135.220.15]:59067 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZMoi-0006hc-MC for qemu-devel@nongnu.org; Mon, 06 May 2013 10:55:04 -0400 Message-ID: <5187C445.6080703@suse.de> Date: Mon, 06 May 2013 16:55:01 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [RFC][PATCH 08/15] isa: implement isa_is_ioport_assigned via memory_region_find List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jan Kiszka Cc: Paolo Bonzini , Liu Ping Fan , qemu-devel Am 06.05.2013 16:26, schrieb Jan Kiszka: > Move isa_is_ioport_assigned to the ISA core and implement it via a > memory region lookup. As all IO ports are now directly or indirectly > registered via the memory API, this becomes possible and will finally > allow us to drop the ioport tables. >=20 > Signed-off-by: Jan Kiszka > --- > hw/acpi/piix4.c | 6 +++--- > hw/isa/isa-bus.c | 11 +++++++++++ > hw/isa/lpc_ich9.c | 8 ++++---- > include/exec/ioport.h | 1 - > include/hw/isa/isa.h | 2 ++ > ioport.c | 7 ------- > 6 files changed, 20 insertions(+), 15 deletions(-) >=20 > diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c > index c4af1cc..5955217 100644 > --- a/hw/acpi/piix4.c > +++ b/hw/acpi/piix4.c > @@ -386,10 +386,10 @@ static void piix4_pm_machine_ready(Notifier *n, v= oid *opaque) > uint8_t *pci_conf; > =20 > pci_conf =3D s->dev.config; > - pci_conf[0x5f] =3D (isa_is_ioport_assigned(0x378) ? 0x80 : 0) | 0x= 10; > + pci_conf[0x5f] =3D (isa_is_ioport_assigned(NULL, 0x378) ? 0x80 : 0= ) | 0x10; > pci_conf[0x63] =3D 0x60; > - pci_conf[0x67] =3D (isa_is_ioport_assigned(0x3f8) ? 0x08 : 0) | > - (isa_is_ioport_assigned(0x2f8) ? 0x90 : 0); > + pci_conf[0x67] =3D (isa_is_ioport_assigned(NULL, 0x3f8) ? 0x08 : 0= ) | > + (isa_is_ioport_assigned(NULL, 0x2f8) ? 0x90 : 0); > =20 > } > =20 Is there really no way to access the ISABus from this device? Would be nice to get rid of global ISA variables and not introduce more dependencies. :) Andreas [...] > diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c > index 667e882..641227a 100644 > --- a/hw/isa/lpc_ich9.c > +++ b/hw/isa/lpc_ich9.c > @@ -480,19 +480,19 @@ static void ich9_lpc_machine_ready(Notifier *n, v= oid *opaque) > uint8_t *pci_conf; > =20 > pci_conf =3D s->d.config; > - if (isa_is_ioport_assigned(0x3f8)) { > + if (isa_is_ioport_assigned(s->isa_bus, 0x3f8)) { > /* com1 */ > pci_conf[0x82] |=3D 0x01; > } > - if (isa_is_ioport_assigned(0x2f8)) { > + if (isa_is_ioport_assigned(s->isa_bus, 0x2f8)) { > /* com2 */ > pci_conf[0x82] |=3D 0x02; > } > - if (isa_is_ioport_assigned(0x378)) { > + if (isa_is_ioport_assigned(s->isa_bus, 0x378)) { > /* lpt */ > pci_conf[0x82] |=3D 0x04; > } > - if (isa_is_ioport_assigned(0x3f0)) { > + if (isa_is_ioport_assigned(s->isa_bus, 0x3f0)) { > /* floppy */ > pci_conf[0x82] |=3D 0x08; > } [snip] --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg