Changeset 24193 in vbox

Timestamp:

Oct 30, 2009 2:27:04 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

54140

Message:

DevAPIC: Properly clear local APIC state on VM reset.

Location:

trunk/src/VBox/Devices/PC

Files:

• DevAPIC.cpp (modified) (5 diffs)
• DevPcBios.cpp (modified) (1 diff)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -202 +202 @@
     /* Task priority register (interrupt level) */
     uint32_t   tpr;
-    /* Logical APIC id */
+    /* Logical APIC id - user programmable */
     LogApicId  id;
-    /* Physical APIC id */
+    /* Physical APIC id - not visible to user, constant */
     PhysApicId phys_id;
     /** @todo: is it logical or physical? Not really used anyway now. */
@@ -411 +411 @@
 static void apicTimerSetInitialCount(APICDeviceInfo *dev, APICState *s, uint32_t initial_count);
 static void apicTimerSetLvt(APICDeviceInfo *dev, APICState *pThis, uint32_t fNew);
+static void apicSendInitIpi(APICDeviceInfo* dev, APICState *s);
 
 #endif /* VBOX */
@@ -557 +558 @@
 #ifdef IN_RING3
             foreach_apic(dev, deliver_bitmask,
-                         apic_init_ipi(dev, apic));
+                         apicSendInitIpi(dev, apic));
             return VINF_SUCCESS;
 #else
@@ -1249 +1250 @@
     s->initial_count_load_time = 0;
     s->next_time = 0;
+}
+
 
 #ifdef VBOX
+static void apicSendInitIpi(APICDeviceInfo* dev, APICState *s)
+{
+    apic_init_ipi(dev, s);
     cpuSendInitIpi(dev, s);
-#endif
-}
+}
+#endif
 
 /* send a SIPI message to the CPU to start it */
@@ -2673 +2679 @@
         TMTimerStop(pApic->CTX_SUFF(pTimer));
 
-        /* Do not send an init ipi to the VCPU; we take
-        * care of the proper init ourselves.
+        /* Clear LAPIC state as if an INIT IPI was sent. */
         apic_init_ipi(dev, pApic);
-        */
-
-        /* malc, I've removed the initing duplicated in apic_init_ipi(). This
-        * arb_id was left over.. */
-        pApic->arb_id = 0;
+        /* The IDs are not touched by apic_init_ipi() and must be reset now. */
+        pApic->arb_id = pApic->id = i;
+        Assert(pApic->id == pApic->phys_id);    /* The two should match again. */
         /* Reset should re-enable the APIC. */
         pApic->apicbase = 0xfee00000 | MSR_IA32_APICBASE_ENABLE;

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -1317 +1317 @@
     floatPtr.u8Checksum            = 0;
     floatPtr.au8Feature[0]         = 0;
-    floatPtr.au8Feature[1]         = 0;
+    floatPtr.au8Feature[1]         = 0x80;
     floatPtr.au8Feature[2]         = 0;
     floatPtr.au8Feature[3]         = 0;