From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KaJSK-0003e8-8w
	for qemu-devel@nongnu.org; Mon, 01 Sep 2008 20:09:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KaJSI-0003d5-TM
	for qemu-devel@nongnu.org; Mon, 01 Sep 2008 20:09:11 -0400
Received: from [199.232.76.173] (port=51064 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KaJSI-0003cq-Gl
	for qemu-devel@nongnu.org; Mon, 01 Sep 2008 20:09:10 -0400
Received: from savannah.gnu.org ([199.232.41.3]:49833 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <aurelien@aurel32.net>)
	id 1KaJSI-0002y7-7A
	for qemu-devel@nongnu.org; Mon, 01 Sep 2008 20:09:10 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <aurelien@aurel32.net>) id 1KaJSH-0004Ey-Ik
	for qemu-devel@nongnu.org; Tue, 02 Sep 2008 00:09:09 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aurel32@savannah.gnu.org>) id 1KaJSG-0004EU-Q6
	for qemu-devel@nongnu.org; Tue, 02 Sep 2008 00:09:09 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1KaJSG-0004EU-Q6@cvs.savannah.gnu.org>
Date: Tue, 02 Sep 2008 00:09:08 +0000
Subject: [Qemu-devel] [5128] 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

Revision: 5128
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5128
Author:   aurel32
Date:     2008-09-02 00:09:08 +0000 (Tue, 02 Sep 2008)

Log Message:
-----------
Reset I32_APIC_BASE on system RESET

Should be done according to spec.

Signed-off-by: Gleb Natapov <gleb@qumranet.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Modified Paths:
--------------
    trunk/hw/apic.c

Modified: trunk/hw/apic.c
===================================================================
--- trunk/hw/apic.c	2008-09-02 00:08:58 UTC (rev 5127)
+++ trunk/hw/apic.c	2008-09-02 00:09:08 UTC (rev 5128)
@@ -869,6 +869,10 @@
 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 @@
     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);