@@ -60,10 +60,11 @@ void isa_bus_new(ISABus *bus, ISABusOps *ops, DeviceState *host)
void isa_bus_irqs(ISABus *bus, qemu_irq *irqs)
{
- if (!isabus || !isabus->ops->set_irqs) {
+ if (!bus || !bus->ops->set_irqs) {
hw_error("Tried to set isa irqs with no isa bus present.");
}
- isabus->ops->set_irqs(isabus, irqs);
+ assert(bus == isabus);
+ bus->ops->set_irqs(bus, irqs);
}
/*
@@ -74,10 +75,11 @@ void isa_bus_irqs(ISABus *bus, qemu_irq *irqs)
*/
qemu_irq isa_get_irq(ISABus *bus, int isairq)
{
- if (!isabus || !isabus->ops->get_irq) {
+ if (!bus || !bus->ops->get_irq) {
hw_error("ISA bus invalid");
}
- return isabus->ops->get_irq(isabus, isairq);
+ assert(bus == isabus);
+ return bus->ops->get_irq(bus, isairq);
}
void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq)
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> --- hw/isa-bus.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)