mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/isa/isa-bus: Replace hw_error() by assert()

Browse Source 
As we can never have more than ISA_NUM_IRQS (16) ISA IRQs,
replace the not very interesting hw_error() call by an
assert() which is more useful to debug condition that can
not happen.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200901104043.91383-6-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Philippe Mathieu-Daudé 2020-09-01 12:40:43 +02:00 committed by Laurent Vivier
parent 5e4b6bb1e8
commit 0c66619835
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/isa/isa-bus.c
View File

@ -21,7 +21,6 @@
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "hw/hw.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
@ -85,18 +84,14 @@ void isa_bus_irqs(ISABus *bus, qemu_irq *irqs)
qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq) qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq)
{ {
assert(!dev || ISA_BUS(qdev_get_parent_bus(DEVICE(dev))) == isabus); assert(!dev || ISA_BUS(qdev_get_parent_bus(DEVICE(dev))) == isabus);
if (isairq >= ISA_NUM_IRQS) { assert(isairq < ISA_NUM_IRQS);
hw_error("isa irq %d invalid", isairq);
}
return isabus->irqs[isairq]; return isabus->irqs[isairq];
} }
void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq) void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq)
{ {
assert(dev->nirqs < ARRAY_SIZE(dev->isairq)); assert(dev->nirqs < ARRAY_SIZE(dev->isairq));
if (isairq >= ISA_NUM_IRQS) { assert(isairq < ISA_NUM_IRQS);
hw_error("isa irq %d invalid", isairq);
}
dev->isairq[dev->nirqs] = isairq; dev->isairq[dev->nirqs] = isairq;
*p = isa_get_irq(dev, isairq); *p = isa_get_irq(dev, isairq);
dev->nirqs++; dev->nirqs++;