From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KYLKP-00058e-Uv
	for qemu-devel@nongnu.org; Wed, 27 Aug 2008 09:44:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KYLKO-00058A-EV
	for qemu-devel@nongnu.org; Wed, 27 Aug 2008 09:44:53 -0400
Received: from [199.232.76.173] (port=55148 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KYLKO-000586-4V
	for qemu-devel@nongnu.org; Wed, 27 Aug 2008 09:44:52 -0400
Received: from il.qumranet.com ([212.179.150.194]:22859)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <gleb@qumranet.com>) id 1KYLKN-0007ht-IF
	for qemu-devel@nongnu.org; Wed, 27 Aug 2008 09:44:51 -0400
Received: from gleb-debian.qumranet.com (gleb-debian.qumranet.com.qumranet.com
	[172.16.15.143])
	by il.qumranet.com (Postfix) with ESMTP id C259E250310
	for <qemu-devel@nongnu.org>; Wed, 27 Aug 2008 16:44:48 +0300 (IDT)
Date: Wed, 27 Aug 2008 16:44:48 +0300
From: Gleb Natapov <gleb@qumranet.com>
Message-ID: <20080827134448.GY6192@minantech.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Subject: [Qemu-devel] Reset I32_APIC_BASE on system RESET
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


Should be done according to spec.

Signed-off-by: Gleb Natapov <gleb@qumranet.com>
diff --git a/hw/apic.c b/hw/apic.c
index 43d748c..64e75ad 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -869,6 +869,10 @@ static int apic_load(QEMUFile *f, void *opaque, int version_id)
 static void apic_reset(void *opaque)
 {
     APICState *s = opaque;
+
+    s->apicbase = 0xfee00000 |
+        (s->id ? 0 : MSR_IA32_APICBASE_BSP) | MSR_IA32_APICBASE_ENABLE;
+
     apic_init_ipi(s);
 
     if (s->id == 0) {
@@ -906,8 +910,6 @@ int apic_init(CPUState *env)
     s->id = last_apic_id++;
     env->cpuid_apic_id = s->id;
     s->cpu_env = env;
-    s->apicbase = 0xfee00000 |
-        (s->id ? 0 : MSR_IA32_APICBASE_BSP) | MSR_IA32_APICBASE_ENABLE;
 
     apic_reset(s);
 
--
			Gleb.