[Qemu-devel] [PATCH 11/11] isa: remove limitation of only one ISA bus

[Hervé Poussineau]

Default ISA bus will be the first created

Signed-off-by: Hervé Poussineau <address@hidden>
---
 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)
 
 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 = ops;
-    isabus = bus;
+    if (!isabus) {
+        isabus = bus;
+    }
 }
 
 void isa_bus_irqs(qemu_irq *irqs)
-- 
1.7.5.4