Changeset 90947 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 27, 2021 11:40:29 AM (3 years ago)

Author:

vboxsync

Message:

VMM/HM: Don't use VMMR0IsLogFlushDisabled, use !VMMRZCallRing3IsEnabled instead. The VMMR0*LogFlushDisable functions will disappear shortly. bugref:10086

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (4 diffs)
• HMVMXR0.cpp (modified) (4 diffs)

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

@@ -2965 +2965 @@
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
     Assert(!VMMRZCallRing3IsEnabled(pVCpu));
-    Assert(VMMR0IsLogFlushDisabled(pVCpu));
 
     /*
@@ -3107 +3106 @@
 
     VMMRZCallRing3Disable(pVCpu);
-    Assert(VMMR0IsLogFlushDisabled(pVCpu));
 
     Log4Func(("Calling hmR0SvmLongJmpToRing3\n"));
@@ -4224 +4222 @@
 {
     Assert(!VMMRZCallRing3IsEnabled(pVCpu));
-    Assert(VMMR0IsLogFlushDisabled(pVCpu));
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
@@ -5495 +5492 @@
         Log4Func(("vcpu[%u] -v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-\n", (a_pVCpu)->idCpu)); \
         HMSVM_ASSERT_PREEMPT_SAFE((a_pVCpu)); \
-        if (VMMR0IsLogFlushDisabled((a_pVCpu))) \
+        if (!VMMRZCallRing3IsEnabled((a_pVCpu))) \
             HMSVM_ASSERT_PREEMPT_CPUID(); \
     } while (0)

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

@@ -8736 +8736 @@
 
     VMMRZCallRing3Disable(pVCpu);
-    Assert(VMMR0IsLogFlushDisabled(pVCpu));
 
     Log4Func(("-> hmR0VmxLongJmpToRing3 enmOperation=%d\n", enmOperation));
@@ -9667 +9666 @@
     HMVMX_ASSERT_PREEMPT_SAFE(pVCpu);
     Assert(!VMMRZCallRing3IsEnabled(pVCpu));
-    Assert(VMMR0IsLogFlushDisabled(pVCpu));
 
 #ifdef HMVMX_ALWAYS_SYNC_FULL_GUEST_STATE
@@ -11016 +11014 @@
 {
     Assert(!VMMRZCallRing3IsEnabled(pVCpu));
-    Assert(VMMR0IsLogFlushDisabled(pVCpu));
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
     Assert(!pVCpu->hm.s.Event.fPending);
@@ -13252 +13249 @@
         Log4Func(("vcpu[%RU32]\n", (a_pVCpu)->idCpu)); \
         HMVMX_ASSERT_PREEMPT_SAFE(a_pVCpu); \
-        if (VMMR0IsLogFlushDisabled((a_pVCpu))) \
+        if (!VMMRZCallRing3IsEnabled((a_pVCpu))) \
             HMVMX_ASSERT_PREEMPT_CPUID(); \
         HMVMX_STOP_EXIT_DISPATCH_PROF(); \