From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LtivT-0002SO-UM for qemu-devel@nongnu.org; Tue, 14 Apr 2009 09:43:48 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LtivN-0002Ph-3Q for qemu-devel@nongnu.org; Tue, 14 Apr 2009 09:43:45 -0400 Received: from [199.232.76.173] (port=47336 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LtivL-0002PF-HM for qemu-devel@nongnu.org; Tue, 14 Apr 2009 09:43:39 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:53715) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LtivL-0008VU-1l for qemu-devel@nongnu.org; Tue, 14 Apr 2009 09:43:39 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e37.co.us.ibm.com (8.13.1/8.13.1) with ESMTP id n3EDh2AZ000529 for ; Tue, 14 Apr 2009 07:43:02 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n3EDhUk5113514 for ; Tue, 14 Apr 2009 07:43:31 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n3EDhRpk016932 for ; Tue, 14 Apr 2009 07:43:29 -0600 Message-ID: <49E49315.20305@us.ibm.com> Date: Tue, 14 Apr 2009 09:43:49 -0400 From: Beth Kon MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] Fix non-ACPI Timer Interrupt Routing References: <49E3D91E.40208@us.ibm.com> <20090414011027.GF25977@us.ibm.com> In-Reply-To: <20090414011027.GF25977@us.ibm.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Ryan Harper Cc: bochs-developers@lists.sourceforge.net, qemu-devel , herbszt@gmx.de Ryan Harper wrote: > * 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? =) > I guess the significance of it isn't clear, huh? I'll add a comment. :-) > >> // $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. > Ok. > >> 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; >> > > >