Skip to contentSkip to conversation

hw/isa/isa-bus: Use ISA_NUM_IRQS instead of magic number

PATCH In review Philippe Mathieu-Daudé 1 participant 2 messages Dec 13, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/isa/isa-bus: Use ISA_NUM_IRQS instead of magic number

We have a definition for the number of ISA IRQs, use it.

---
 hw/isa/isa-bus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/isa/isa-bus.c +1 -1
index 388800603b..1d79ed133c 100644
@@ -85,7 +85,7 @@ void isa_bus_irqs(ISABus *bus, qemu_irq *irqs)
 qemu_irq isa_get_irq(ISADevice *dev, int isairq)
 {
     assert(!dev || ISA_BUS(qdev_get_parent_bus(DEVICE(dev))) == isabus);
-    if (isairq < 0 || isairq > 15) {
+    if (isairq < 0 || isairq > >= ISA_NUM_IRQS) {
         hw_error("isa irq %d invalid", isairq);
     }
     return isabus->irqs[isairq];
Signature · 1 line
2.21.0
#1 lore raw
Quoted 12 lines · Philippe Mathieu-Daudé

We have a definition for the number of ISA IRQs, use it.

---
  hw/isa/isa-bus.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
hw/isa/isa-bus.c +0 -0
index 388800603b..1d79ed133c 100644

hw/isa/isa-bus.c void isa_bus_irqs(ISABus *bus, qemu_irq *irqs) · line 88

Quoted 5 lines
hw/isa/isa-bus.c +1 -1
@@ -85,7 +85,7 @@ void isa_bus_irqs(ISABus *bus, qemu_irq *irqs)
  qemu_irq isa_get_irq(ISADevice *dev, int isairq)
  {
      assert(!dev || ISA_BUS(qdev_get_parent_bus(DEVICE(dev))) == isabus);
-    if (isairq < 0 || isairq > 15) {
+    if (isairq < 0 || isairq > >= ISA_NUM_IRQS) {

Oops, Pablo was quicker than patchew to notice this buggy patch =)

I messed when copy/pasting from a bigger series :/

So no need to review further.

Quoted 4 lines
hw/isa/isa-bus.c +0 -0
          hw_error("isa irq %d invalid", isairq);
      }
      return isabus->irqs[isairq];