aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorHervé Poussineau <hpoussin@reactos.org>2011-12-15 22:10:00 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2011-12-20 15:44:31 -0600
commitd3c68e4f45b54c447c9a169533c286cb1be62b59 (patch)
tree3632c0c8fbe66f258ba95cd3849207098c34f814 /hw
parent75782268d682828e1ebbaa1cfaf63ecde50dad54 (diff)
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>
Diffstat (limited to 'hw')
-rw-r--r--hw/isa-bus.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 320768036c..5af790bf81 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;
}
/*