From patchwork Fri May 13 12:13:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 782712 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4DCEJ7u032223 for ; Fri, 13 May 2011 12:14:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759012Ab1EMMOX (ORCPT ); Fri, 13 May 2011 08:14:23 -0400 Received: from goliath.siemens.de ([192.35.17.28]:30207 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758529Ab1EMMOU (ORCPT ); Fri, 13 May 2011 08:14:20 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p4DCEBpX028822; 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 p4DCEAv9019933; Fri, 13 May 2011 14:14:11 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 04/16] qemu-kvm: Drop IRQ0 override test from ioapic_set_irq Date: Fri, 13 May 2011 14:13:58 +0200 Message-Id: <1f4e95a22a6397729461883d155916be032a9dba.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 (demeter1.kernel.org [140.211.167.41]); Fri, 13 May 2011 12:14:35 +0000 (UTC) The IRQ0 override is not configurable while using the user space IOAPIC. When the in-kernel irqchip is active, ioapic_set_irq is never called. So drop this useless test. Signed-off-by: Jan Kiszka --- hw/ioapic.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/hw/ioapic.c b/hw/ioapic.c index 2ac6127..084d37a 100644 --- a/hw/ioapic.c +++ b/hw/ioapic.c @@ -22,7 +22,6 @@ #include "hw.h" #include "pc.h" -#include "sysemu.h" #include "apic.h" #include "ioapic.h" #include "qemu-timer.h" @@ -146,7 +145,7 @@ static void ioapic_set_irq(void *opaque, int vector, int level) * the cleanest way of doing it but it should work. */ DPRINTF("%s: %s vec %x\n", __func__, level ? "raise" : "lower", vector); - if (vector == 0 && irq0override) { + if (vector == 0) { vector = 2; } if (vector >= 0 && vector < IOAPIC_NUM_PINS) {