[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 05/10] hw/isa/isa-bus: assert() if isa_get_irq() gets passed
From: |
Bernhard Beschow |
Subject: |
[RFC PATCH 05/10] hw/isa/isa-bus: assert() if isa_get_irq() gets passed a NULL ISADevice |
Date: |
Mon, 27 Jun 2022 09:16:06 +0200 |
Now that all call-sites have been fixed to pass non-NULL ISADevices, we can
assert() on NULL ISADevices to catch regressions.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/isa/isa-bus.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 0537a9f2c1..9e8b5da027 100644
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -81,9 +81,10 @@ 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);
+ assert(dev);
assert(isairq < ISA_NUM_IRQS);
- return isabus->irqs[isairq];
+
+ return isa_bus_from_device(dev)->irqs[isairq];
}
void isa_connect_gpio_out(ISADevice *isadev, int gpioirq, unsigned isairq)
--
2.36.1
- [RFC PATCH 00/10] Resolve isabus global, Bernhard Beschow, 2022/06/27
- [RFC PATCH 01/10] hw/ide/piix: Check for presence of ISABus before using it, Bernhard Beschow, 2022/06/27
- [RFC PATCH 02/10] Revert "hw/ide: Fix crash when plugging a piix3-ide device into the x-remote machine", Bernhard Beschow, 2022/06/27
- [RFC PATCH 06/10] hw/ide/ioport: Rename ide_init_ioport() to isa_ide_init_ioport(), Bernhard Beschow, 2022/06/27
- [RFC PATCH 05/10] hw/isa/isa-bus: assert() if isa_get_irq() gets passed a NULL ISADevice,
Bernhard Beschow <=
- [RFC PATCH 04/10] hw/ide/piix: Avoid the isabus global when wiring ISA interrupts for internal devices, Bernhard Beschow, 2022/06/27
- [RFC PATCH 08/10] hw/ide/piix: Use pci_ide_init_ioport() rather than isa_ide_init_ioport(), Bernhard Beschow, 2022/06/27
- [RFC PATCH 09/10] hw/isa: Resolve unneeded usage of isabus global, Bernhard Beschow, 2022/06/27
- [RFC PATCH 10/10] hw/isa/isa-bus: Resolve isabus global, Bernhard Beschow, 2022/06/27
- [RFC PATCH 07/10] hw/pci/pci: Introduce pci_register_portio_list(), Bernhard Beschow, 2022/06/27
- [RFC PATCH 03/10] hw/i386/pc_piix: Allow for setting properties on "piix3-ide" before realizing it, Bernhard Beschow, 2022/06/27