From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LtWXT-0006S4-Gp for qemu-devel@nongnu.org; Mon, 13 Apr 2009 20:30:11 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LtWXP-0006OG-QI for qemu-devel@nongnu.org; Mon, 13 Apr 2009 20:30:11 -0400 Received: from [199.232.76.173] (port=35593 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LtWXP-0006O8-Mk for qemu-devel@nongnu.org; Mon, 13 Apr 2009 20:30:07 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:60811) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LtWXP-0001P0-9k for qemu-devel@nongnu.org; Mon, 13 Apr 2009 20:30:07 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e33.co.us.ibm.com (8.13.1/8.13.1) with ESMTP id n3E0SRwJ016211 for ; Mon, 13 Apr 2009 18:28:27 -0600 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n3E0U2sG065532 for ; Mon, 13 Apr 2009 18:30:03 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n3E0U2j1001088 for ; Mon, 13 Apr 2009 18:30:02 -0600 Message-ID: <49E3D91E.40208@us.ibm.com> Date: Mon, 13 Apr 2009 20:30:22 -0400 From: Beth Kon MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------030207050708090304000305" Subject: [Qemu-devel] [PATCH] Fix non-ACPI Timer Interrupt Routing Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel , bochs-developers@lists.sourceforge.net Cc: eswierk@artisanetworks.com, herbszt@gmx.de This is a multi-part message in MIME format. --------------030207050708090304000305 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Replicate ACPI irq0->inti2 override in mp table for non-acpi case. Signed-off-by: Beth Kon --------------030207050708090304000305 Content-Type: text/x-diff; name="non_acpi_irqrouting.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="non_acpi_irqrouting.patch" diff --git a/bios/BIOS-bochs-latest b/bios/BIOS-bochs-latest index ebec71b..82d7792 100644 Binary files a/bios/BIOS-bochs-latest and b/bios/BIOS-bochs-latest differ diff --git a/bios/rombios32.c b/bios/rombios32.c index 7be4216..bc17118 100644 --- a/bios/rombios32.c +++ b/bios/rombios32.c @@ -1,4 +1,4 @@ -///////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////// // $Id$ ///////////////////////////////////////////////////////////////////////// // @@ -1168,6 +1168,10 @@ static void mptable_init(void) /* irqs */ for(i = 0; i < 16; i++) { +#ifdef BX_QEMU + if (i == 2) + continue; +#endif putb(&q, 3); /* entry type = I/O interrupt */ putb(&q, 0); /* interrupt type = vectored interrupt */ putb(&q, 0); /* flags: po=0, el=0 */ @@ -1175,7 +1179,11 @@ static void mptable_init(void) putb(&q, 0); /* source bus ID = ISA */ putb(&q, i); /* source bus IRQ */ putb(&q, ioapic_id); /* dest I/O APIC ID */ +#ifdef BX_QEMU + putb(&q, i == 0 ? 2 : i); /* dest I/O APIC interrupt in */ +#else putb(&q, i); /* dest I/O APIC interrupt in */ +#endif } /* patch length */ len = q - mp_config_table; --------------030207050708090304000305--