[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/16] hw/isa/piix4: Resolve redundant i8259[] attribute
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 05/16] hw/isa/piix4: Resolve redundant i8259[] attribute |
Date: |
Mon, 7 Mar 2022 11:11:56 +0100 |
From: Bernhard Beschow <shentey@gmail.com>
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>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
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.34.1
- [PULL 00/16] MIPS patches for 2022-03-07, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 01/16] target/mips: Fix cycle counter timing calculations, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 02/16] target/mips: Remove duplicated MIPSCPU::cp0_count_rate, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 03/16] hw/mips/gt64xxx_pci: Fix PCI IRQ levels to be preserved during migration, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 04/16] malta: Move PCI interrupt handling from gt64xxx_pci to piix4, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 05/16] hw/isa/piix4: Resolve redundant i8259[] attribute,
Philippe Mathieu-Daudé <=
- [PULL 06/16] hw/isa/piix4: Pass PIIX4State as opaque parameter for piix4_set_irq(), Philippe Mathieu-Daudé, 2022/03/07
- [PULL 07/16] hw/isa/piix4: Resolve global instance variable, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 08/16] hw/isa/piix4: Replace some magic IRQ constants, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 09/16] hw/mips/gt64xxx_pci: Resolve gt64120_register(), Philippe Mathieu-Daudé, 2022/03/07
- [PULL 10/16] hw/rtc/mc146818rtc: QOM'ify IRQ number, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 11/16] hw/rtc/m48t59-isa: QOM'ify IRQ number, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 12/16] hw/input/pckbd: QOM'ify IRQ numbers, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 13/16] hw/isa/isa-bus: Remove isabus_dev_print(), Philippe Mathieu-Daudé, 2022/03/07
- [PULL 14/16] isa: Drop unused attributes from ISADevice, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 15/16] isa: Inline and remove one-line isa_init_irq(), Philippe Mathieu-Daudé, 2022/03/07