From: Bernhard Beschow <shentey@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Hervé Poussineau" <hpoussin@reactos.org>,
"Bernhard Beschow" <shentey@gmail.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PATCH v2 5/5] isa/piix4: Resolve redundant i8259[] attribute
Date: Sat, 12 Feb 2022 12:35:19 +0100 [thread overview]
Message-ID: <20220212113519.69527-6-shentey@gmail.com> (raw)
In-Reply-To: <20220212113519.69527-1-shentey@gmail.com>
This is a follow-up on patch "malta: Move PCI interrupt handling from
gt64xxx 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>
---
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 a9322851db..692fa8d1f9 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -43,7 +43,6 @@ struct PIIX4State {
PCIDevice dev;
qemu_irq cpu_intr;
qemu_irq *isa;
- qemu_irq i8259[ISA_NUM_IRQS];
int32_t pci_irq_levels[PIIX_NUM_PIRQS];
@@ -73,7 +72,7 @@ static void piix4_set_irq(void *opaque, int irq_num, int level)
pic_level |= s->pci_irq_levels[i];
}
}
- qemu_set_irq(s->i8259[pic_irq], pic_level);
+ qemu_set_irq(s->isa[pic_irq], pic_level);
}
}
@@ -323,9 +322,5 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, I2CBus **smbus)
pci_bus_irqs(pci_bus, piix4_set_irq, pci_slot_get_pirq, s, PIIX_NUM_PIRQS);
- for (int i = 0; i < ISA_NUM_IRQS; i++) {
- s->i8259[i] = qdev_get_gpio_in_named(dev, "isa", i);
- }
-
return dev;
}
--
2.35.1
next prev parent reply other threads:[~2022-02-12 11:49 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-12 11:35 [PATCH v2 0/5] malta: Fix PCI IRQ levels to be preserved during migration Bernhard Beschow
2022-02-12 11:35 ` [PATCH v2 1/5] malta: Move PCI interrupt handling from gt64xxx to piix4 Bernhard Beschow
2022-02-12 13:18 ` BALATON Zoltan
2022-02-12 16:44 ` BALATON Zoltan
2022-02-13 14:21 ` Bernhard Beschow
2022-02-13 14:34 ` Bernhard Beschow
2022-02-12 11:35 ` [PATCH v2 2/5] pci: Always pass own DeviceState to pci_map_irq_fn's Bernhard Beschow
2022-02-12 13:27 ` BALATON Zoltan
2022-02-12 14:23 ` Bernhard Beschow
2022-02-12 16:13 ` BALATON Zoltan
2022-02-13 14:31 ` Bernhard Beschow
2022-02-13 15:22 ` BALATON Zoltan
2022-02-12 16:16 ` Peter Maydell
2022-02-12 11:35 ` [PATCH v2 3/5] isa/piix4: Resolve global variables Bernhard Beschow
2022-02-12 11:35 ` [PATCH v2 4/5] isa/piix4: Fix PCI IRQ levels to be preserved in VMState Bernhard Beschow
2022-02-12 13:42 ` BALATON Zoltan
2022-02-12 16:41 ` Peter Maydell
2022-02-12 17:02 ` BALATON Zoltan
2022-02-12 18:30 ` Peter Maydell
2022-02-12 21:44 ` BB
2022-02-12 21:46 ` Bernhard Beschow
2022-02-12 11:35 ` Bernhard Beschow [this message]
2022-02-12 13:19 ` [PATCH v2 5/5] isa/piix4: Resolve redundant i8259[] attribute BALATON Zoltan
2022-02-12 14:02 ` BB
2022-02-12 14:05 ` Bernhard Beschow
2022-02-12 15:57 ` BALATON Zoltan
2022-02-12 15:58 ` BALATON Zoltan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220212113519.69527-6-shentey@gmail.com \
--to=shentey@gmail.com \
--cc=aurelien@aurel32.net \
--cc=f4bug@amsat.org \
--cc=hpoussin@reactos.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).