From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] qemu-kvm: Fix non-ISA IRQ routing in kernel irqchip mode Date: Mon, 23 May 2011 10:32:56 +0200 Message-ID: <4DDA1BB8.40409@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: kvm To: Avi Kivity , Marcelo Tosatti Return-path: Received: from goliath.siemens.de ([192.35.17.28]:18126 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752499Ab1EWIdB (ORCPT ); Mon, 23 May 2011 04:33:01 -0400 Sender: kvm-owner@vger.kernel.org List-ID: Merge regression of d1dcf63406: The KVM i8259 believes it is also an IOAPIC and takes all GSIs. Until we refactor this, work around it by avoiding the isa_irq_handler dispatcher in kernel irqchip mode. Signed-off-by: Jan Kiszka --- hw/pc_piix.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 66c5e04..7af03fa 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -131,7 +131,11 @@ static void pc_init1(ram_addr_t ram_size, if (pci_enabled) { ioapic_init(isa_irq_state); } - isa_irq = qemu_allocate_irqs(isa_irq_handler, isa_irq_state, 24); + if (!(kvm_enabled() && kvm_irqchip_in_kernel())) { + isa_irq = qemu_allocate_irqs(isa_irq_handler, isa_irq_state, 24); + } else { + isa_irq = i8259; + } if (pci_enabled) { if (!xen_enabled()) { -- 1.7.1