[Qemu-devel] [PATCH v2 15/21] q35: Fix non-PCI IRQ processing in ich9_lpc_update_apic

[Jason Baron]

From: Jan Kiszka <address@hidden>

Avoid passing a non-PCI IRQ to ich9_gsi_to_pirq. It's wrong and triggers
an assertion.

Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Jason Baron <address@hidden>
---
 hw/q35.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hw/q35.c b/hw/q35.c
index ff570ce..5d256cb 100644
--- a/hw/q35.c
+++ b/hw/q35.c
@@ -663,9 +663,11 @@ static void ich9_lpc_update_apic(ICH9LPCIrqState 
*irq_state, int gsi)
 {
     GMCHPCIHost *s = container_of(irq_state, GMCHPCIHost, irq_state);
     ICH9LPCState *lpc = irq_state->lpc;
-    int level;
+    int level = 0;
 
-    level = pci_bus_get_irq_level(s->host.pci.bus, ich9_gsi_to_pirq(gsi));
+    if (gsi >= ICH9_LPC_PIC_NUM_PINS) {
+        level |= pci_bus_get_irq_level(s->host.pci.bus, ich9_gsi_to_pirq(gsi));
+    }
     if (gsi == ich9_lpc_sci_irq(lpc)) {
         level |= lpc->sci_level;
     }
-- 
1.7.1