diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2020-09-01 12:40:43 +0200 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2020-09-09 15:25:28 +0200 |
| commit | 0c66619835a8f5a2884e783500944924d9f52bc8 (patch) | |
| tree | 933b16103b4cf3061472497faaef818d89b893ad /hw/isa | |
| parent | 5e4b6bb1e8afb4cc2fcaaa6f3e57a6ec5184953f (diff) | |
| download | qemu-0c66619835a8f5a2884e783500944924d9f52bc8.zip | |
hw/isa/isa-bus: Replace hw_error() by assert()
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>
Diffstat (limited to 'hw/isa')
| -rw-r--r-- | hw/isa/isa-bus.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index 58fde178f9..10bb7ffa43 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -21,7 +21,6 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/hw.h" #include "monitor/monitor.h" #include "hw/sysbus.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) { assert(!dev || ISA_BUS(qdev_get_parent_bus(DEVICE(dev))) == isabus); - if (isairq >= ISA_NUM_IRQS) { - hw_error("isa irq %d invalid", isairq); - } + assert(isairq < ISA_NUM_IRQS); return isabus->irqs[isairq]; } void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq) { assert(dev->nirqs < ARRAY_SIZE(dev->isairq)); - if (isairq >= ISA_NUM_IRQS) { - hw_error("isa irq %d invalid", isairq); - } + assert(isairq < ISA_NUM_IRQS); dev->isairq[dev->nirqs] = isairq; *p = isa_get_irq(dev, isairq); dev->nirqs++; |