From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>, "Sergio Lopez" <slp@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
qemu-ppc@nongnu.org, "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Hervé Poussineau" <hpoussin@reactos.org>
Subject: [PATCH 02/11] hw/isa/i82378: Rename output IRQ as 'cpu_intr'
Date: Fri, 10 Feb 2023 17:37:35 +0100 [thread overview]
Message-ID: <20230210163744.32182-3-philmd@linaro.org> (raw)
In-Reply-To: <20230210163744.32182-1-philmd@linaro.org>
Commit a04ff94097 ("prep: Add i82378 PCI-to-ISA bridge
emulation") aimed to model the 2 output IRQs: CPU intr
and NMI. Commit 5039d6e235 ("i8257: remove cpu_request_exit
irq") removed the NMI IRQ.
Since this model only use the CPU interrupt, replace the
'out[2]' array by a single 'cpu_intr'.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.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 e3322e03bf..84ce761f5f 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 cpu_intr;
qemu_irq *i8259;
MemoryRegion io;
};
@@ -50,7 +50,7 @@ static const VMStateDescription vmstate_i82378 = {
static void i82378_request_out0_irq(void *opaque, int irq, int level)
{
I82378State *s = opaque;
- qemu_set_irq(s->out[0], level);
+ qemu_set_irq(s->cpu_intr, level);
}
static void i82378_request_pic_irq(void *opaque, int irq, int level)
@@ -113,7 +113,7 @@ static void i82378_init(Object *obj)
DeviceState *dev = DEVICE(obj);
I82378State *s = I82378(obj);
- qdev_init_gpio_out(dev, s->out, 1);
+ qdev_init_gpio_out(dev, &s->cpu_intr, 1);
qdev_init_gpio_in(dev, i82378_request_pic_irq, 16);
}
--
2.38.1
next prev parent reply other threads:[~2023-02-10 16:38 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-10 16:37 [PATCH 00/11] hw/isa: More housekeeping Philippe Mathieu-Daudé
2023-02-10 16:37 ` [PATCH 01/11] hw/intc/i8259: Document i8259_init() Philippe Mathieu-Daudé
2023-02-11 17:09 ` Richard Henderson
2023-02-10 16:37 ` Philippe Mathieu-Daudé [this message]
2023-02-11 17:10 ` [PATCH 02/11] hw/isa/i82378: Rename output IRQ as 'cpu_intr' Richard Henderson
2023-02-10 16:37 ` [PATCH 03/11] hw/isa/i82378: Remove intermediate IRQ forwarder Philippe Mathieu-Daudé
2023-02-11 17:13 ` Richard Henderson
2023-02-10 16:37 ` [PATCH 04/11] hw/isa/vt82c686: " Philippe Mathieu-Daudé
2023-02-10 16:37 ` [PATCH 05/11] hw/mips/jazz: Rename ISA input IRQs as 'isa_irqs_in' Philippe Mathieu-Daudé
2023-02-11 17:18 ` Richard Henderson
2023-02-10 16:37 ` [PATCH 06/11] hw/sparc64/sun4u: Keep reference to ISA input IRQs in EbusState Philippe Mathieu-Daudé
2023-02-11 17:30 ` Richard Henderson
2023-02-10 16:37 ` [PATCH 07/11] hw/isa: Reorder to separate ISABus* vs ISADevice* functions Philippe Mathieu-Daudé
2023-02-11 17:32 ` Richard Henderson
2023-02-10 16:37 ` [PATCH 08/11] hw/isa: Un-inline isa_bus_from_device() Philippe Mathieu-Daudé
2023-02-10 16:37 ` [PATCH 09/11] hw/isa: Rename isa_bus_irqs() -> isa_bus_register_input_irqs() Philippe Mathieu-Daudé
2023-02-11 17:37 ` Richard Henderson
2023-02-10 16:37 ` [PATCH 10/11] hw/isa: Use isa_address_space_io() to reduce access on global 'isabus' Philippe Mathieu-Daudé
2023-02-10 16:37 ` [PATCH 11/11] hw/isa: Factor isa_bus_get_irq() out of isa_get_irq() Philippe Mathieu-Daudé
2023-02-11 17:46 ` Richard Henderson
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=20230210163744.32182-3-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=hpoussin@reactos.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=slp@redhat.com \
--cc=thuth@redhat.com \
/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).