From mboxrd@z Thu Jan  1 00:00:00 1970
From: Glauber Costa <gcosta@redhat.com>
Subject: use smp_cpus as lapic id
Date: Mon, 03 Mar 2008 13:26:12 -0300
Message-ID: <47CC26A4.2070500@redhat.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------060106060809080807020904"
To: Avi Kivity <avi@qumranet.com>, kvm-devel@lists.sourceforge.net,
	Marcelo Tosatti <marcelo@kvack.org>
Return-path: <kvm-devel-bounces@lists.sourceforge.net>
List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/kvm-devel>,
	<mailto:kvm-devel-request@lists.sourceforge.net?subject=unsubscribe>
List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=kvm-devel>
List-Post: <mailto:kvm-devel@lists.sourceforge.net>
List-Help: <mailto:kvm-devel-request@lists.sourceforge.net?subject=help>
List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/kvm-devel>,
	<mailto:kvm-devel-request@lists.sourceforge.net?subject=subscribe>
Sender: kvm-devel-bounces@lists.sourceforge.net
Errors-To: kvm-devel-bounces@lists.sourceforge.net
List-Id: kvm.vger.kernel.org

This is a multi-part message in MIME format.
--------------060106060809080807020904
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

apic is not acpi, although they are acronyms. Due to a confusion of 
mine, those things were mixed, leading to a bug reported at
https://sourceforge.net/tracker/index.php?func=detail&aid=1903732&group_id=180599&atid=893831

This patch fixes it, by assigning smp_cpus instead of MAX_CPUS to 
lapic_id in the MP APIC tables.

Signed-off-by: Glauber Costa <gcosta@redhat.com>

--------------060106060809080807020904
Content-Type: text/x-patch;
 name="apic_id.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="apic_id.patch"

diff --git a/bios/rombios32.c b/bios/rombios32.c
index 77e71ac..af18390 100755
--- a/bios/rombios32.c
+++ b/bios/rombios32.c
@@ -983,7 +983,7 @@ #endif
     putstr(&q, "ISA   ");
 
     /* ioapic */
-    ioapic_id = MAX_CPUS;
+    ioapic_id = smp_cpus;
     putb(&q, 2); /* entry type = I/O APIC */
     putb(&q, ioapic_id); /* apic ID */
     putb(&q, 0x11); /* I/O APIC version number */
@@ -1427,7 +1427,7 @@ #endif
         io_apic = (void *)apic;
         io_apic->type = APIC_IO;
         io_apic->length = sizeof(*io_apic);
-        io_apic->io_apic_id = MAX_CPUS;
+        io_apic->io_apic_id = smp_cpus;
         io_apic->address = cpu_to_le32(0xfec00000);
         io_apic->interrupt = cpu_to_le32(0);
 
diff --git a/qemu/pc-bios/bios.bin b/qemu/pc-bios/bios.bin
index 64b7abb..3a75ff5 100644
Binary files a/qemu/pc-bios/bios.bin and b/qemu/pc-bios/bios.bin differ

--------------060106060809080807020904
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
--------------060106060809080807020904
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel

--------------060106060809080807020904--