Changeset 49666 in vbox

Timestamp:

Nov 26, 2013 4:20:09 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Fix darwin 32-bit/PAE kernel case.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -5851 +5851 @@
         HM_DISABLE_PREEMPT_IF_NEEDED();
 
+        /* Doing the check here ensures we don't overwrite already-saved guest MSRs from a preemption hook. */
         if (!(pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_LAZY_MSRS))
         {
@@ -5860 +5861 @@
         VMMRZCallRing3Enable(pVCpu);
     }
-#else
+    else
+    {
+        /* Darwin 32-bit/PAE kernels. */
+        pVCpu->hm.s.vmx.fUpdatedGuestState |= HMVMX_UPDATED_GUEST_LAZY_MSRS;
+    }
+#else   /* HC_ARCH_BITS == 32 */
     pVCpu->hm.s.vmx.fUpdatedGuestState |= HMVMX_UPDATED_GUEST_LAZY_MSRS;
 #endif