hw/isa/piix4: Resolve redundant i8259[] attribute
This is a follow-up on patch "malta: Move PCI interrupt handling from gt64xxx_pci to piix4" where i8259[] was moved from MaltaState to PIIX4State to make the code movement more obvious. However, i8259[] seems redundant to *isa, so remove it. Signed-off-by: Bernhard Beschow <shentey@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Acked-by: Michael S. Tsirkin <mst@redhat.com> Message-Id: <20220217101924.15347-4-shentey@gmail.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
parent
a7fc988051
commit
933ab073be
|
@ -45,7 +45,6 @@ struct PIIX4State {
|
||||||
PCIDevice dev;
|
PCIDevice dev;
|
||||||
qemu_irq cpu_intr;
|
qemu_irq cpu_intr;
|
||||||
qemu_irq *isa;
|
qemu_irq *isa;
|
||||||
qemu_irq i8259[ISA_NUM_IRQS];
|
|
||||||
|
|
||||||
RTCState rtc;
|
RTCState rtc;
|
||||||
/* Reset Control Register */
|
/* Reset Control Register */
|
||||||
|
@ -320,11 +319,7 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, I2CBus **smbus)
|
||||||
NULL, 0, NULL);
|
NULL, 0, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
pci_bus_irqs(pci_bus, piix4_set_irq, pci_slot_get_pirq, s->i8259, 4);
|
pci_bus_irqs(pci_bus, piix4_set_irq, pci_slot_get_pirq, s->isa, 4);
|
||||||
|
|
||||||
for (int i = 0; i < ISA_NUM_IRQS; i++) {
|
|
||||||
s->i8259[i] = qdev_get_gpio_in_named(dev, "isa", i);
|
|
||||||
}
|
|
||||||
|
|
||||||
return dev;
|
return dev;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue