Changeset 50600 in vbox

Timestamp:

Feb 26, 2014 11:11:04 AM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: This should not be necessary, while in preemption hook we're already non-preemptible and no-long-jump guaranteed.

File:

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

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

@@ -5596 +5596 @@
     NOREF(pMixedCtx);
 
-    /* Since this can be called from our preemption hook it's safer to make the guest-CR0 update non-preemptible. */
-    VMMRZCallRing3Disable(pVCpu);
-    HM_DISABLE_PREEMPT_IF_NEEDED();
-
+    int rc = VINF_SUCCESS:
     if (!HMVMXCPU_GST_IS_UPDATED(pVCpu, HMVMX_UPDATED_GUEST_CR0))
     {
         uint32_t uVal    = 0;
-        int rc = VMXReadVmcs32(VMX_VMCS_GUEST_CR0,            &uVal);
+        rc = VMXReadVmcs32(VMX_VMCS_GUEST_CR0,            &uVal);
         AssertRCReturn(rc, rc);
 
@@ -5614 +5611 @@
         HMVMXCPU_GST_SET_UPDATED(pVCpu, HMVMX_UPDATED_GUEST_CR0);
     }
-
-    HM_RESTORE_PREEMPT_IF_NEEDED();
-    VMMRZCallRing3Enable(pVCpu);
-
-    return VINF_SUCCESS;
+    return rc;
 }