[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 054/126] hw/isa/i82378: Rename output IRQ as 'cpu_intr'
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 054/126] hw/isa/i82378: Rename output IRQ as 'cpu_intr' |
Date: |
Mon, 27 Feb 2023 15:01:01 +0100 |
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>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230210163744.32182-3-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
- [PULL 044/126] hw/i2c/smbus_ich9: Inline ich9_smb_init() and remove it, (continued)
- [PULL 044/126] hw/i2c/smbus_ich9: Inline ich9_smb_init() and remove it, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 045/126] hw/i386/pc_q35: Allow for setting properties before realizing TYPE_ICH9_LPC_DEVICE, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 047/126] hw/isa/lpc_ich9: Remove redundant ich9_lpc_reset() invocation, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 046/126] hw/isa/lpc_ich9: Connect PM stuff to LPC internally, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 049/126] hw: Move ioapic*.h to intc/, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 048/126] hw/i386/ich9: Remove redundant GSI_NUM_PINS, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 050/126] hw/i386/ich9: Clean up includes, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 052/126] hw/pci: Fix a typo, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 051/126] hw: Move ich9.h to southbridge/, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 053/126] hw/intc/i8259: Document i8259_init(), Philippe Mathieu-Daudé, 2023/02/27
- [PULL 054/126] hw/isa/i82378: Rename output IRQ as 'cpu_intr',
Philippe Mathieu-Daudé <=
- [PULL 055/126] hw/isa/i82378: Remove intermediate IRQ forwarder, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 056/126] hw/isa/vt82c686: Remove intermediate IRQ forwarder, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 057/126] hw/sparc64/sun4u: Keep reference to ISA input IRQs in EbusState, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 058/126] hw/isa: Remove empty ISADeviceClass structure, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 059/126] hw/isa: Reorder to separate ISABus* vs ISADevice* functions, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 060/126] hw/isa: Un-inline isa_bus_from_device(), Philippe Mathieu-Daudé, 2023/02/27
- [PULL 061/126] hw/isa: Rename isa_bus_irqs() -> isa_bus_register_input_irqs(), Philippe Mathieu-Daudé, 2023/02/27
- [PULL 062/126] hw/isa: Use isa_address_space_io() to reduce access on global 'isabus', Philippe Mathieu-Daudé, 2023/02/27
- [PULL 063/126] hw/isa: Rename isa_get_dma() -> isa_bus_get_dma(), Philippe Mathieu-Daudé, 2023/02/27
- [PULL 066/126] hw/rtc/mc146818rtc: Rename RTCState -> MC146818RtcState, Philippe Mathieu-Daudé, 2023/02/27