[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/11] x86: rewrite gsi_handler()
From: |
Gerd Hoffmann |
Subject: |
[PULL 01/11] x86: rewrite gsi_handler() |
Date: |
Thu, 10 Dec 2020 13:13:49 +0100 |
Rewrite function to use switch() for IRQ number mapping.
Check i8259_irq exists before raising it so the function
also works in case no i8259 (aka pic) is present.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 20201203105423.10431-3-kraxel@redhat.com
---
hw/i386/x86.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 5944fc44edca..b67e7b789f89 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -588,11 +588,17 @@ void gsi_handler(void *opaque, int n, int level)
GSIState *s = opaque;
trace_x86_gsi_interrupt(n, level);
- if (n < ISA_NUM_IRQS) {
- /* Under KVM, Kernel will forward to both PIC and IOAPIC */
- qemu_set_irq(s->i8259_irq[n], level);
+ switch (n) {
+ case 0 ... ISA_NUM_IRQS - 1:
+ if (s->i8259_irq[n]) {
+ /* Under KVM, Kernel will forward to both PIC and IOAPIC */
+ qemu_set_irq(s->i8259_irq[n], level);
+ }
+ /* fall through */
+ case ISA_NUM_IRQS ... IOAPIC_NUM_PINS - 1:
+ qemu_set_irq(s->ioapic_irq[n], level);
+ break;
}
- qemu_set_irq(s->ioapic_irq[n], level);
}
void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name)
--
2.27.0
- [PULL 00/11] Microvm 20201210 patches, Gerd Hoffmann, 2020/12/10
- [PULL 03/11] microvm: make number of virtio transports runtime changeable, Gerd Hoffmann, 2020/12/10
- [PULL 10/11] tests/acpi: update expected data files, Gerd Hoffmann, 2020/12/10
- [PULL 07/11] tests/acpi: allow updates for expected data files, Gerd Hoffmann, 2020/12/10
- [PULL 01/11] x86: rewrite gsi_handler(),
Gerd Hoffmann <=
- [PULL 02/11] x86: add support for second ioapic, Gerd Hoffmann, 2020/12/10
- [PULL 04/11] microvm: make pcie irq base runtime changeable, Gerd Hoffmann, 2020/12/10
- [PULL 11/11] tests/acpi: disallow updates for expected data files, Gerd Hoffmann, 2020/12/10
- [PULL 06/11] microvm: add second ioapic, Gerd Hoffmann, 2020/12/10
- [PULL 09/11] tests/acpi: add ioapic2=on test for microvm, Gerd Hoffmann, 2020/12/10
- [PULL 05/11] microvm: drop microvm_gsi_handler(), Gerd Hoffmann, 2020/12/10
- [PULL 08/11] tests/acpi: add data files for ioapic2 test variant, Gerd Hoffmann, 2020/12/10
- Re: [PULL 00/11] Microvm 20201210 patches, Peter Maydell, 2020/12/10