From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LP6Q6-0008AS-68
	for qemu-devel@nongnu.org; Mon, 19 Jan 2009 21:32:50 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LP6Q5-00089g-No
	for qemu-devel@nongnu.org; Mon, 19 Jan 2009 21:32:49 -0500
Received: from [199.232.76.173] (port=56954 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LP6Q5-00089X-1T
	for qemu-devel@nongnu.org; Mon, 19 Jan 2009 21:32:49 -0500
Received: from mx2.redhat.com ([66.187.237.31]:39299)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mtosatti@redhat.com>) id 1LP6Q4-0001OF-LZ
	for qemu-devel@nongnu.org; Mon, 19 Jan 2009 21:32:48 -0500
Message-Id: <20090120023057.574821101@amt.cnet>
Date: Tue, 20 Jan 2009 00:30:42 -0200
From: Marcelo Tosatti <mtosatti@redhat.com>
References: <20090120023040.623163208@amt.cnet>
Content-Disposition: inline; filename=0003_mptable_unconditional.patch
Subject: [Qemu-devel] [patch 2/9] kvm: bios: generate mptable unconditionally
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org, bochs-developers@lists.sourceforge.net
Cc: Anthony Liguori <aliguori@us.ibm.com>, Avi Kivity <avi@redhat.com>

VMware ESX requires an mptable even for uniprocessor guests.

Signed-off-by: Avi Kivity <avi@qumranet.com>
From: Avi Kivity <avi@qumranet.com>

Index: bochs/bios/rombios32.c
===================================================================
--- bochs.orig/bios/rombios32.c
+++ bochs/bios/rombios32.c
@@ -970,11 +970,6 @@ static void mptable_init(void)
     int ioapic_id, i, len;
     int mp_config_table_size;
 
-#ifdef BX_QEMU
-    if (smp_cpus <= 1)
-        return;
-#endif
-
 #ifdef BX_USE_EBDA_TABLES
     mp_config_table = (uint8_t *)(ram_size - ACPI_DATA_SIZE - MPTABLE_MAX_SIZE);
 #else