[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 11/14] q35: Fix non-PCI IRQ processing in ich9_lp
From: |
Jason Baron |
Subject: |
[Qemu-devel] [PATCH v4 11/14] q35: Fix non-PCI IRQ processing in ich9_lpc_update_apic |
Date: |
Wed, 14 Nov 2012 15:54:08 -0500 |
From: Jan Kiszka <address@hidden>
Avoid passing a non-PCI IRQ to ich9_gsi_to_pirq. It's wrong and triggers
an assertion.
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Jason Baron <address@hidden>
---
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 f8f06b3..2fc83a4 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;
}
--
1.7.1
- [Qemu-devel] [PATCH v4 03/14] pc_piix: Move kvm irq routing functions out of pc_piix.c, (continued)
- [Qemu-devel] [PATCH v4 03/14] pc_piix: Move kvm irq routing functions out of pc_piix.c, Jason Baron, 2012/11/14
- [Qemu-devel] [PATCH v4 04/14] pc/piix_pci: factor out smram/pam logic, Jason Baron, 2012/11/14
- [Qemu-devel] [PATCH v4 05/14] ich9: Add acpi support and definitions, Jason Baron, 2012/11/14
- [Qemu-devel] [PATCH v4 06/14] ich9: Add the lpc chip, Jason Baron, 2012/11/14
- [Qemu-devel] [PATCH v4 07/14] ich9: Add smbus, Jason Baron, 2012/11/14
- [Qemu-devel] [PATCH v4 08/14] q35: Introduce q35 pc based chipset emulator, Jason Baron, 2012/11/14
- [Qemu-devel] [PATCH v4 09/14] ich9: Add i82801b11 dmi-to-pci bridge, Jason Baron, 2012/11/14
- [Qemu-devel] [PATCH v4 10/14] q35: Suppress SMM BIOS initialization under KVM, Jason Baron, 2012/11/14
- [Qemu-devel] [PATCH v4 11/14] q35: Fix non-PCI IRQ processing in ich9_lpc_update_apic,
Jason Baron <=
- [Qemu-devel] [PATCH v4 12/14] q35: Add kvmclock support, Jason Baron, 2012/11/14
- [Qemu-devel] [PATCH v4 13/14] Add a fallback bios file search, if -L fails., Jason Baron, 2012/11/14
- [Qemu-devel] [PATCH v4 14/14] q35: automatically load the q35 dsdt table, Jason Baron, 2012/11/14
- Re: [Qemu-devel] [PATCH v4 00/14] Add Q35 base support, Gerd Hoffmann, 2012/11/22
- Re: [Qemu-devel] [PATCH v4 00/14] Add Q35 base support, Gerd Hoffmann, 2012/11/22