diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2012-11-14 15:54:08 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-26 09:35:37 -0600 |
| commit | 243b95111c8b8d171e627247a7de16e94c7e9de0 (patch) | |
| tree | c507e5c7b8aaf5c477e0ba4cfebd4b8082bb4df2 | |
| parent | 21bcfdd9a43041720f9370831c694bcb2e11eea4 (diff) | |
| download | qemu-243b95111c8b8d171e627247a7de16e94c7e9de0.tar.gz | |
q35: Fix non-PCI IRQ processing in ich9_lpc_update_apic
Avoid passing a non-PCI IRQ to ich9_gsi_to_pirq. It's wrong and triggers
an assertion.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/lpc_ich9.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/lpc_ich9.c b/hw/lpc_ich9.c index f8f06b394c..2fc83a496f 100644 --- a/hw/lpc_ich9.c +++ b/hw/lpc_ich9.c @@ -264,9 +264,11 @@ static int ich9_gsi_to_pirq(int gsi) static void ich9_lpc_update_apic(ICH9LPCState *lpc, int gsi) { - int level; + int level = 0; - level = pci_bus_get_irq_level(lpc->d.bus, ich9_gsi_to_pirq(gsi)); + if (gsi >= ICH9_LPC_PIC_NUM_PINS) { + level |= pci_bus_get_irq_level(lpc->d.bus, ich9_gsi_to_pirq(gsi)); + } if (gsi == ich9_lpc_sci_irq(lpc)) { level |= lpc->sci_level; } |