Changeset 99687 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

May 9, 2023 4:17:08 AM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

157232

Message:

VMM: Nested VMX: bugref:10318 Moved vmxHCGetGuestIntrStateWithUpdate() back into vmxHCEvaluatePendingEvent[Nested] as it implicitly ensures ordering.

File:

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

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

@@ -5923 +5923 @@
         vmxHCTrpmTrapToPendingEvent(pVCpu);
 
-    uint32_t const fIntrState = vmxHCGetGuestIntrStateWithUpdate(pVCpu);
+    uint32_t fIntrState;
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
     if (!pVmxTransient->fIsNestedGuest)
-        rcStrict = vmxHCEvaluatePendingEvent(pVCpu, pVmxTransient->pVmcsInfo);
+        rcStrict = vmxHCEvaluatePendingEvent(pVCpu, pVmxTransient->pVmcsInfo, &fIntrState);
     else
-        rcStrict = vmxHCEvaluatePendingEventNested(pVCpu, pVmxTransient->pVmcsInfo);
+        rcStrict = vmxHCEvaluatePendingEventNested(pVCpu, pVmxTransient->pVmcsInfo, &fIntrState);
 
     /*
@@ -5943 +5943 @@
     }
 #else
-    rcStrict = vmxHCEvaluatePendingEvent(pVCpu, pVmxTransient->pVmcsInfo);
+    rcStrict = vmxHCEvaluatePendingEvent(pVCpu, pVmxTransient->pVmcsInfo, &fIntrState);
     Assert(rcStrict == VINF_SUCCESS);
 #endif