From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAOdZ-0007K4-6G for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RAOdY-0008Fw-06 for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:33 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:34626) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAOdX-0008Fo-90 for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:31 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 2 Oct 2011 18:10:28 +0200 Message-Id: <1317571828-9059-17-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 16/16] isa: remove limitation of only one ISA bus 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?= Signed-off-by: Herv=C3=A9 Poussineau --- hw/isa-bus.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index ab8dbe9..f01dfb2 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -22,7 +22,6 @@ #include "isa.h" #include "exec-memory.h" =20 -static ISABus *isabus; target_phys_addr_t isa_mem_base =3D 0; =20 static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent)= ; @@ -50,12 +49,8 @@ ISABus *isa_bus_bridge_init(MemoryRegion *address_spac= e_io) =20 void isa_bus_new(ISABus *bus, ISABusOps *ops, DeviceState *host) { - if (isabus) { - hw_error("Can't create a second ISA bus"); - } qbus_create_inplace(&bus->qbus, &isa_bus_info, host, NULL); bus->ops =3D ops; - isabus =3D bus; } =20 void isa_bus_irqs(ISABus *bus, qemu_irq *irqs) @@ -63,7 +58,6 @@ void isa_bus_irqs(ISABus *bus, qemu_irq *irqs) if (!bus || !bus->ops->set_irqs) { hw_error("Tried to set isa irqs with no isa bus present."); } - assert(bus =3D=3D isabus); bus->ops->set_irqs(bus, irqs); } =20 @@ -78,7 +72,6 @@ qemu_irq isa_get_irq(ISABus *bus, int isairq) if (!bus || !bus->ops->get_irq) { hw_error("ISA bus invalid"); } - assert(bus =3D=3D isabus); return bus->ops->get_irq(bus, isairq); } =20 @@ -119,7 +112,6 @@ void isa_register_ioport(ISADevice *dev, MemoryRegion= *io, uint16_t start) { 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."); } @@ -157,7 +149,6 @@ ISADevice *isa_create(ISABus *bus, const char *name) hw_error("Tried to create isa device %s with no isa bus present.= ", name); } - assert(bus =3D=3D isabus); dev =3D qdev_create(&bus->qbus, name); return DO_UPCAST(ISADevice, qdev, dev); } @@ -170,7 +161,6 @@ ISADevice *isa_try_create(ISABus *bus, const char *na= me) hw_error("Tried to create isa device %s with no isa bus present.= ", name); } - assert(bus =3D=3D isabus); dev =3D qdev_try_create(&bus->qbus, name); return DO_UPCAST(ISADevice, qdev, dev); } --=20 1.7.6.3