[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/11] hw/sparc64/sun4u: Keep reference to ISA input IRQs in Ebus
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 06/11] hw/sparc64/sun4u: Keep reference to ISA input IRQs in EbusState |
Date: |
Fri, 10 Feb 2023 17:37:39 +0100 |
Keep reference to ISA input IRQs in EbusState.
To emphasize input/output distinction, rename arrays
as isa_irqs_in / isa_irqs_out.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/sparc64/sun4u.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 387181ff77..8fe47e2c22 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -84,7 +84,8 @@ struct EbusState {
PCIDevice parent_obj;
ISABus *isa_bus;
- qemu_irq isa_bus_irqs[ISA_NUM_IRQS];
+ qemu_irq *isa_irqs_in;
+ qemu_irq isa_irqs_out[ISA_NUM_IRQS];
uint64_t console_serial_base;
MemoryRegion bar0;
MemoryRegion bar1;
@@ -287,7 +288,7 @@ static const TypeInfo power_info = {
static void ebus_isa_irq_handler(void *opaque, int n, int level)
{
EbusState *s = EBUS(opaque);
- qemu_irq irq = s->isa_bus_irqs[n];
+ qemu_irq irq = s->isa_irqs_out[n];
/* Pass ISA bus IRQs onto their gpio equivalent */
trace_ebus_isa_irq_handler(n, level);
@@ -303,7 +304,6 @@ static void ebus_realize(PCIDevice *pci_dev, Error **errp)
ISADevice *isa_dev;
SysBusDevice *sbd;
DeviceState *dev;
- qemu_irq *isa_irq;
DriveInfo *fd[MAX_FD];
int i;
@@ -315,9 +315,9 @@ static void ebus_realize(PCIDevice *pci_dev, Error **errp)
}
/* ISA bus */
- isa_irq = qemu_allocate_irqs(ebus_isa_irq_handler, s, ISA_NUM_IRQS);
- isa_bus_irqs(s->isa_bus, isa_irq);
- qdev_init_gpio_out_named(DEVICE(s), s->isa_bus_irqs, "isa-irq",
+ s->isa_irqs_in = qemu_allocate_irqs(ebus_isa_irq_handler, s, ISA_NUM_IRQS);
+ isa_bus_irqs(s->isa_bus, s->isa_irqs_in);
+ qdev_init_gpio_out_named(DEVICE(s), s->isa_irqs_out, "isa-irq",
ISA_NUM_IRQS);
/* Serial ports */
--
2.38.1
- [PATCH 00/11] hw/isa: More housekeeping, Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 01/11] hw/intc/i8259: Document i8259_init(), Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 02/11] hw/isa/i82378: Rename output IRQ as 'cpu_intr', Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 03/11] hw/isa/i82378: Remove intermediate IRQ forwarder, Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 04/11] hw/isa/vt82c686: Remove intermediate IRQ forwarder, Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 05/11] hw/mips/jazz: Rename ISA input IRQs as 'isa_irqs_in', Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 06/11] hw/sparc64/sun4u: Keep reference to ISA input IRQs in EbusState,
Philippe Mathieu-Daudé <=
- [PATCH 07/11] hw/isa: Reorder to separate ISABus* vs ISADevice* functions, Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 08/11] hw/isa: Un-inline isa_bus_from_device(), Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 09/11] hw/isa: Rename isa_bus_irqs() -> isa_bus_register_input_irqs(), Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 11/11] hw/isa: Factor isa_bus_get_irq() out of isa_get_irq(), Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 10/11] hw/isa: Use isa_address_space_io() to reduce access on global 'isabus', Philippe Mathieu-Daudé, 2023/02/10