[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 3/7] hw/isa/piix4: Resolve redundant i8259[] attribute
From: |
Bernhard Beschow |
Subject: |
[PATCH v4 3/7] hw/isa/piix4: Resolve redundant i8259[] attribute |
Date: |
Thu, 17 Feb 2022 11:19:20 +0100 |
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>
---
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
- [PATCH v4 0/7] malta: Fix PCI IRQ levels to be preserved during migration, cleanup, Bernhard Beschow, 2022/02/17
- [PATCH v4 1/7] hw/mips/gt64xxx_pci: Fix PCI IRQ levels to be preserved during migration, Bernhard Beschow, 2022/02/17
- [PATCH v4 3/7] hw/isa/piix4: Resolve redundant i8259[] attribute,
Bernhard Beschow <=
- [PATCH v4 4/7] hw/isa/piix4: Pass PIIX4State as opaque parameter for piix4_set_irq(), Bernhard Beschow, 2022/02/17
- [PATCH v4 5/7] hw/isa/piix4: Resolve global instance variable, Bernhard Beschow, 2022/02/17
- [PATCH v4 2/7] malta: Move PCI interrupt handling from gt64xxx_pci to piix4, Bernhard Beschow, 2022/02/17
- [PATCH v4 7/7] hw/mips/gt64xxx_pci: Resolve gt64120_register(), Bernhard Beschow, 2022/02/17
- [PATCH v4 6/7] hw/isa/piix4: Replace some magic IRQ constants, Bernhard Beschow, 2022/02/17
- Re: [PATCH v4 0/7] malta: Fix PCI IRQ levels to be preserved during migration, cleanup, Bernhard Beschow, 2022/02/25