On Wed, Feb 16, 2022 at 11:45:15PM +0100, Bernhard Beschow wrote:
> 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 <shen...@gmail.com>
Acked-by: Michael S. Tsirkin <m...@redhat.com>
> ---
> hw/isa/piix4.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
> index 196b56e69c..179968b18e 100644
> --- a/hw/isa/piix4.c
> +++ b/hw/isa/piix4.c
> @@ -45,7 +45,6 @@ struct PIIX4State {
> PCIDevice dev;
> qemu_irq cpu_intr;
> qemu_irq *isa;
> - qemu_irq i8259[ISA_NUM_IRQS];
>
> RTCState rtc;
> /* Reset Control Register */
> @@ -320,11 +319,7 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus
> **isa_bus, I2CBus **smbus)
> NULL, 0, NULL);
> }
>
> - pci_bus_irqs(pci_bus, piix4_set_irq, pci_slot_get_pirq, s->i8259, 4);
> -
> - for (int i = 0; i < ISA_NUM_IRQS; i++) {
> - s->i8259[i] = qdev_get_gpio_in_named(dev, "isa", i);
> - }
> + pci_bus_irqs(pci_bus, piix4_set_irq, pci_slot_get_pirq, s->isa, 4);
>
> return dev;
> }
> --
> 2.35.1
>
>
>
