From: Hervé Poussineau <hpoussin@reactos.org>
Date: Thu, 15 Dec 2011 21:10:00 +0000 (+0100)
Subject: isa: always use provided ISA bus in isa_bus_irqs()
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d3c68e4f45b54c447c9a169533c286cb1be62b59;p=qemu-xen-4.4-testing.git

isa: always use provided ISA bus in isa_bus_irqs()

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 320768036..5af790bf8 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -53,8 +53,10 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space_io)
 
 void isa_bus_irqs(ISABus *bus, qemu_irq *irqs)
 {
-    assert(!bus || bus == isabus);
-    isabus->irqs = irqs;
+    if (!bus) {
+        hw_error("Can't set isa irqs with no isa bus present.");
+    }
+    bus->irqs = irqs;
 }
 
 /*