[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 3/4] hw/isa/i82378: Rename output IRQ variable
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 3/4] hw/isa/i82378: Rename output IRQ variable |
Date: |
Tue, 11 May 2021 06:06:20 +0200 |
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.3