Changeset 55307 in vbox for trunk/src/VBox

Timestamp:

Apr 16, 2015 1:16:17 PM (10 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: nit.

File:

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

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

@@ -7356 +7356 @@
          * to be updated too. This is a stripped down version which gets out ASAP trying to not trigger any assertion.
          */
+        RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER; \
         VMMRZCallRing3RemoveNotification(pVCpu);
         VMMRZCallRing3Disable(pVCpu);
-        HM_DISABLE_PREEMPT();
+        RTThreadPreemptDisable(&PreemptState);
 
         PVM pVM = pVCpu->CTX_SUFF(pVM);
@@ -7376 +7377 @@
         if (   pVM->hm.s.fAllow64BitGuests
             && pVCpu->hm.s.vmx.fLazyMsrs)
-        {
             hmR0VmxLazyRestoreHostMsrs(pVCpu);
-        }
 #endif
         /* Update auto-load/store host MSRs values when we re-enter VT-x (as we could be on a different CPU). */
@@ -7390 +7389 @@
 
         VMMR0ThreadCtxHooksDeregister(pVCpu);
-
         HMR0LeaveCpu(pVCpu);
-        HM_RESTORE_PREEMPT();
+        RTThreadPreemptRestore(&PreemptState);
         return VINF_SUCCESS;
     }