[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/18] hw/isa/isa-bus: Replace hw_error() by assert()
From: |
Laurent Vivier |
Subject: |
[PULL 02/18] hw/isa/isa-bus: Replace hw_error() by assert() |
Date: |
Fri, 11 Sep 2020 21:33:14 +0200 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
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>
---
hw/isa/isa-bus.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 58fde178f92a..10bb7ffa43ae 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++;
--
2.26.2
- [PULL 00/18] Trivial branch for 5.2 patches, Laurent Vivier, 2020/09/11
- [PULL 02/18] hw/isa/isa-bus: Replace hw_error() by assert(),
Laurent Vivier <=
- [PULL 04/18] hw/gpio/omap_gpio: Replace fprintf() by qemu_log_mask(GUEST_ERROR), Laurent Vivier, 2020/09/11
- [PULL 03/18] hw/acpi/tco: Remove unused definitions, Laurent Vivier, 2020/09/11
- [PULL 05/18] hw/gpio/max7310: Replace disabled printf() by qemu_log_mask(UNIMP), Laurent Vivier, 2020/09/11
- [PULL 06/18] Makefile: Drop extra phony cscope, Laurent Vivier, 2020/09/11
- [PULL 08/18] hw/net/e1000e: Remove overwritten read handler for STATUS register, Laurent Vivier, 2020/09/11
- [PULL 09/18] hw/net/e1000e: Remove duplicated write handler for FLSWDATA register, Laurent Vivier, 2020/09/11
- [PULL 01/18] hw/mips/fuloong2e: Convert pointless error message to an assert(), Laurent Vivier, 2020/09/11
- [PULL 07/18] Makefile: Skip the meson subdir in cscope/TAGS/ctags, Laurent Vivier, 2020/09/11
- [PULL 11/18] kconfig: fix comment referring to old Makefiles, Laurent Vivier, 2020/09/11
- [PULL 12/18] hw: hyperv: vmbus: Fix 32bit compilation, Laurent Vivier, 2020/09/11