From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LtXAb-0005zd-Gm for qemu-devel@nongnu.org; Mon, 13 Apr 2009 21:10:37 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LtXAW-0005yK-LQ for qemu-devel@nongnu.org; Mon, 13 Apr 2009 21:10:36 -0400 Received: from [199.232.76.173] (port=54261 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LtXAW-0005yF-C6 for qemu-devel@nongnu.org; Mon, 13 Apr 2009 21:10:32 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:52430) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LtXAV-0004Uh-QH for qemu-devel@nongnu.org; Mon, 13 Apr 2009 21:10:32 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e35.co.us.ibm.com (8.13.1/8.13.1) with ESMTP id n3E15JTf003238 for ; Mon, 13 Apr 2009 19:05:19 -0600 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n3E1ATTL197090 for ; Mon, 13 Apr 2009 19:10:29 -0600 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n3E1ATA5004205 for ; Mon, 13 Apr 2009 19:10:29 -0600 Date: Mon, 13 Apr 2009 20:10:27 -0500 From: Ryan Harper Subject: Re: [Qemu-devel] [PATCH] Fix non-ACPI Timer Interrupt Routing Message-ID: <20090414011027.GF25977@us.ibm.com> References: <49E3D91E.40208@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <49E3D91E.40208@us.ibm.com> Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Beth Kon Cc: bochs-developers@lists.sourceforge.net, eswierk@artisanetworks.com, qemu-devel , herbszt@gmx.de * Elizabeth Kon [2009-04-13 19:35]: > Replicate ACPI irq0->inti2 override in mp table for non-acpi case. > > Signed-off-by: Beth Kon > 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 @@ > -///////////////////////////////////////////////////////////////////////// > +//////////////////////////////////////////////////////////////////////// Did you mean to change the number of slashs? =) > // $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 I'd think that deserves a comment on why we're skipping i==2. > 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; -- Ryan Harper Software Engineer; Linux Technology Center IBM Corp., Austin, Tx ryanh@us.ibm.com