From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Huacai Chen" <chenhuacai@kernel.org>,
"Greg Kurz" <groug@kaod.org>,
"Hervé Poussineau" <hpoussin@reactos.org>,
qemu-ppc@nongnu.org, "Aurelien Jarno" <aurelien@aurel32.net>,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: [PATCH 3/6] hw/isa/i82378: Rename output IRQ variable
Date: Wed, 24 Mar 2021 00:13:55 +0100 [thread overview]
Message-ID: <20210323231358.396520-4-f4bug@amsat.org> (raw)
In-Reply-To: <20210323231358.396520-1-f4bug@amsat.org>
The i82378 has 2 output IRQs: "INT" and "NMI".
We do not model the NMI, so simplify I82378State by
removing the unused IRQ. To avoid keeping an array of
one element, remove the array and rename the variable.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/isa/i82378.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c
index 817eca47053..164d6c65f64 100644
--- a/hw/isa/i82378.c
+++ b/hw/isa/i82378.c
@@ -32,7 +32,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(I82378State, I82378)
struct I82378State {
PCIDevice parent_obj;
- qemu_irq out[2];
+ qemu_irq intr;
qemu_irq *i8259;
MemoryRegion io;
};
@@ -88,7 +88,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp)
*/
/* 2 82C59 (irq) */
- s->i8259 = i8259_init(isabus, s->out[0]);
+ s->i8259 = i8259_init(isabus, s->intr);
isa_bus_irqs(isabus, s->i8259);
/* 1 82C54 (pit) */
@@ -106,7 +106,7 @@ static void i82378_init(Object *obj)
DeviceState *dev = DEVICE(obj);
I82378State *s = I82378(obj);
- qdev_init_gpio_out_named(dev, s->out, "intr", 1);
+ qdev_init_gpio_out_named(dev, &s->intr, "intr", 1);
qdev_init_gpio_in(dev, i82378_request_pic_irq, 16);
}
--
2.26.2
next prev parent reply other threads:[~2021-03-23 23:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-23 23:13 [PATCH 0/6] hw/isa: Remove unuseful qemu_allocate_irqs() call Philippe Mathieu-Daudé
2021-03-23 23:13 ` [PATCH 1/6] hw/isa/i82378: Name output IRQ as 'intr' Philippe Mathieu-Daudé
2021-03-23 23:13 ` [PATCH 2/6] hw/isa/i82378: Simplify removing unuseful qemu_allocate_irqs() call Philippe Mathieu-Daudé
2021-03-23 23:13 ` Philippe Mathieu-Daudé [this message]
2021-03-23 23:13 ` [PATCH 4/6] hw/isa/vt82c686: Name output IRQ as 'intr' Philippe Mathieu-Daudé
2021-03-23 23:13 ` [PATCH 5/6] hw/isa/vt82c686: Simplify removing unuseful qemu_allocate_irqs() call Philippe Mathieu-Daudé
2021-03-23 23:43 ` BALATON Zoltan
2021-04-27 12:57 ` Philippe Mathieu-Daudé
2021-03-23 23:13 ` [PATCH 6/6] hw/isa/piix4: Fix leak " Philippe Mathieu-Daudé
2021-04-15 10:30 ` Philippe Mathieu-Daudé
2021-04-27 12:58 ` [PATCH 0/6] hw/isa: Remove " Philippe Mathieu-Daudé
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=20210323231358.396520-4-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=aleksandar.rikalo@syrmia.com \
--cc=aurelien@aurel32.net \
--cc=chenhuacai@kernel.org \
--cc=david@gibson.dropbear.id.au \
--cc=groug@kaod.org \
--cc=hpoussin@reactos.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@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).