From patchwork Mon May 23 08:32:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 808042 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4N8X6ba026560 for ; Mon, 23 May 2011 08:33:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754027Ab1EWIdC (ORCPT ); Mon, 23 May 2011 04:33:02 -0400 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 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p4N8WveT015917; Mon, 23 May 2011 10:32:57 +0200 Received: from mchn199C.mchp.siemens.de ([146.254.215.109]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p4N8WuhD001236; Mon, 23 May 2011 10:32:57 +0200 Message-ID: <4DDA1BB8.40409@siemens.com> Date: Mon, 23 May 2011 10:32:56 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity , Marcelo Tosatti CC: kvm Subject: [PATCH] qemu-kvm: Fix non-ISA IRQ routing in kernel irqchip mode Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 23 May 2011 08:33:06 +0000 (UTC) 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()) {