[Qemu-devel] [5128] Reset I32_APIC_BASE on system RESET

[Aurelien Jarno]

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 <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>

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);