From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38759) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAOdV-00076G-AI for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RAOdT-0008Fd-Rz for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:29 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:34524) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAOdT-0008FY-6e for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:27 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 2 Oct 2011 18:10:27 +0200 Message-Id: <1317571828-9059-16-git-send-email-hpoussin@reactos.org> In-Reply-To: <1317571828-9059-1-git-send-email-hpoussin@reactos.org> References: <1317571828-9059-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 15/16] isa: remove useless test in isa_register_ioport() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Use ISA bus from given device instead of global ISA bus Signed-off-by: Herv=C3=A9 Poussineau --- hw/isa-bus.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 2f9ad24..ab8dbe9 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -117,18 +117,18 @@ void isa_init_ioport(ISADevice *dev, uint16_t iopor= t) =20 void isa_register_ioport(ISADevice *dev, MemoryRegion *io, uint16_t star= t) { - ISABus *bus =3D isabus; + ISABus *bus =3D isa_bus_from_device(dev); =20 + assert(bus =3D=3D isabus); if (!bus || !bus->ops->get_io_space) { hw_error("Tried to register I/O port with no isa bus present."); } =20 memory_region_add_subregion(bus->ops->get_io_space(bus), start, io); - if (dev !=3D NULL) { - assert(dev->nio < ARRAY_SIZE(dev->io)); - dev->io[dev->nio++] =3D io; - isa_init_ioport_range(dev, start, memory_region_size(io)); - } + + assert(dev->nio < ARRAY_SIZE(dev->io)); + dev->io[dev->nio++] =3D io; + isa_init_ioport_range(dev, start, memory_region_size(io)); } =20 static int isa_qdev_init(DeviceState *qdev, DeviceInfo *base) --=20 1.7.6.3