From patchwork Fri May 13 12:13:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 782782 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 p4DCEeGn012211 for ; Fri, 13 May 2011 12:14:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932636Ab1EMMOh (ORCPT ); Fri, 13 May 2011 08:14:37 -0400 Received: from david.siemens.de ([192.35.17.14]:19849 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758600Ab1EMMOQ (ORCPT ); Fri, 13 May 2011 08:14:16 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id p4DCEBu2022934; Fri, 13 May 2011 14:14:11 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p4DCEAv8019933; Fri, 13 May 2011 14:14:11 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 03/16] Revert "qemu-kvm-x86: consider the irq0override flag in kvm_arch_init_irq_routing" Date: Fri, 13 May 2011 14:13:57 +0200 Message-Id: <35f91d719f5ca7bbfa603f2c8be0ba9baf1b6120.1305288845.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: 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]); Fri, 13 May 2011 12:14:40 +0000 (UTC) This reverts commit fd6bfef3d49a62b36092f131690de3e34f84662d. It is a nop, and it always was a nop: irq0override = !kvm_irqchip || kvm_has_gsi_routing But this code is only executed when gsi routing is available. Conflicts: qemu-kvm-x86.c Signed-off-by: Jan Kiszka --- qemu-kvm-x86.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index 6c3a0a9..c039e16 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -317,9 +317,9 @@ int kvm_arch_init_irq_routing(void) } } for (i = 0; i < 24; ++i) { - if (i == 0 && irq0override) { + if (i == 0) { r = kvm_add_irq_route(i, KVM_IRQCHIP_IOAPIC, 2); - } else if (i != 2 || !irq0override) { + } else if (i != 2) { r = kvm_add_irq_route(i, KVM_IRQCHIP_IOAPIC, i); } if (r < 0) {