Changeset 50601 in vbox for trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

Timestamp:

Feb 26, 2014 11:20:12 AM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Undo r92473. We -do- need it, better comments.

File:

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

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

@@ -5596 +5596 @@
     NOREF(pMixedCtx);
 
-    int rc = VINF_SUCCESS:
+    /*
+     * While in the middle of saving guest-CR0, we could get preempted and re-invoked from the preemption hook,
+     * see hmR0VmxLeave(). Safer to just make this code non-preemptible.
+     */
+    VMMRZCallRing3Disable(pVCpu);
+    HM_DISABLE_PREEMPT_IF_NEEDED();
+
     if (!HMVMXCPU_GST_IS_UPDATED(pVCpu, HMVMX_UPDATED_GUEST_CR0))
     {
         uint32_t uVal    = 0;
-        rc = VMXReadVmcs32(VMX_VMCS_GUEST_CR0,            &uVal);
+        int rc = VMXReadVmcs32(VMX_VMCS_GUEST_CR0,            &uVal);
         AssertRCReturn(rc, rc);
 
@@ -5611 +5617 @@
         HMVMXCPU_GST_SET_UPDATED(pVCpu, HMVMX_UPDATED_GUEST_CR0);
     }
-    return rc;
+
+    HM_RESTORE_PREEMPT_IF_NEEDED();
+    VMMRZCallRing3Enable(pVCpu);
+    return VINF_SUCCESS;
 }