diff options
| author | Gerd Hoffmann | 2020-12-03 11:54:13 +0100 |
|---|---|---|
| committer | Gerd Hoffmann | 2020-12-10 08:47:44 +0100 |
| commit | ceea95cd88c8f90ad93a83bbad4a077590316342 (patch) | |
| tree | 7857345653dc1848fef9a9d3e763fc73ce533296 /hw/i386 | |
| parent | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff) | |
| download | qemu-ceea95cd88c8f90ad93a83bbad4a077590316342.tar.gz qemu-ceea95cd88c8f90ad93a83bbad4a077590316342.tar.xz qemu-ceea95cd88c8f90ad93a83bbad4a077590316342.zip | |
x86: rewrite gsi_handler()
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
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/x86.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 5944fc44ed..b67e7b789f 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) |