From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5IoC-0004LL-O6 for qemu-devel@nongnu.org; Sun, 18 Sep 2011 10:57:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R5IoB-0007Wd-JP for qemu-devel@nongnu.org; Sun, 18 Sep 2011 10:57:28 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:56969) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5IoA-0007Up-UC for qemu-devel@nongnu.org; Sun, 18 Sep 2011 10:57:27 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 18 Sep 2011 16:56:43 +0200 Message-Id: <1316357803-2366-12-git-send-email-hpoussin@reactos.org> In-Reply-To: <1316357803-2366-1-git-send-email-hpoussin@reactos.org> References: <1316357803-2366-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 11/11] 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?= Default ISA bus will be the first created Signed-off-by: Herv=C3=A9 Poussineau --- hw/isa-bus.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index b697f65..9e668ef 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -45,12 +45,11 @@ ISABus *isa_bus_bridge_init(void) =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; + if (!isabus) { + isabus =3D bus; + } } =20 void isa_bus_irqs(qemu_irq *irqs) --=20 1.7.5.4