From patchwork Mon Aug 3 13:32:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 30702 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 0D99AB6EDF for ; Tue, 4 Aug 2009 17:52:22 +1000 (EST) Received: from localhost ([127.0.0.1]:39856 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MYEok-0005Xw-NK for incoming@patchwork.ozlabs.org; Tue, 04 Aug 2009 03:52:18 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MYEli-0003xS-Rp for qemu-devel@nongnu.org; Tue, 04 Aug 2009 03:49:10 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MYEld-0003tO-UK for qemu-devel@nongnu.org; Tue, 04 Aug 2009 03:49:10 -0400 Received: from [199.232.76.173] (port=46544 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MYEld-0003tB-IB for qemu-devel@nongnu.org; Tue, 04 Aug 2009 03:49:05 -0400 Received: from mx20.gnu.org ([199.232.41.8]:39870) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MYElc-0007zF-UC for qemu-devel@nongnu.org; Tue, 04 Aug 2009 03:49:05 -0400 Received: from relay1.sgi.com ([192.48.179.29] helo=relay.sgi.com) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MYElc-0005iy-5U for qemu-devel@nongnu.org; Tue, 04 Aug 2009 03:49:04 -0400 Received: from eye3.emea.sgi.com (eye3.emea.sgi.com [144.253.156.24]) by relay1.corp.sgi.com (Postfix) with ESMTP id 52C398F8084; Tue, 4 Aug 2009 00:48:57 -0700 (PDT) Received: from eye3.emea.sgi.com (localhost.localdomain [127.0.0.1]) by eye3.emea.sgi.com (8.14.3/8.14.3) with ESMTP id n747mtb7004247; Tue, 4 Aug 2009 09:48:55 +0200 Received: (from jes@localhost) by eye3.emea.sgi.com (8.14.3/8.14.3/Submit) id n747mtJR004246; Tue, 4 Aug 2009 09:48:55 +0200 X-Authentication-Warning: eye3.emea.sgi.com: jes set sender to jes@sgi.com using -f Message-Id: <20090803133316.956684516@sgi.com> User-Agent: quilt/0.47-1 Date: Mon, 03 Aug 2009 15:32:40 +0200 From: Jes Sorensen To: kevin@koconnor.net References: <20090803133236.207919528@sgi.com> Content-Disposition: inline; filename=0005-ir0override-qemu.patch X-Detected-Operating-System: by mx20.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Anthony Liguori , Beth Kon , qemu-devel , avi@redhat.com Subject: [Qemu-devel] [PATCH 4/5] Set irq0override based on emu_ver. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Enable irq0override when we are running on QEMU. All recent versionsof QEMU rely on irq0override, not just for KVM. Signed-off-by: Jes Sorensen --- src/mptable.c | 4 ---- src/post.c | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) Index: seabios/src/mptable.c =================================================================== --- seabios.orig/src/mptable.c +++ seabios/src/mptable.c @@ -9,11 +9,7 @@ #include "config.h" // CONFIG_* #include "mptable.h" // MPTABLE_SIGNATURE -#if CONFIG_KVM -int irq0override = 1; -#else int irq0override = 0; -#endif void mptable_init(void) Index: seabios/src/post.c =================================================================== --- seabios.orig/src/post.c +++ seabios/src/post.c @@ -171,6 +171,8 @@ post() qemu_cfg_port_probe(); if (qemu_cfg_port) emu_ver = qemu_cfg_get_emulator_rev(); + if ((emu_ver & 0xff00) == EMU_QEMU) + irq0override = 1; pic_setup(); timer_setup();