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

Timestamp:

Feb 9, 2024 11:58:56 AM (13 months ago)

Author:

vboxsync

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

161583

Message:

VMM/HMVMXR0: Nested VMX: bugref:10318 VMCS state 'launched' shouldn't be ORed only in VMX R0 code, each value is a separate state for a while now.

File:

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

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

@@ -4169 +4169 @@
 
     PVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
-    bool const   fResumeVM = RT_BOOL(pVmcsInfo->fVmcsState & VMX_V_VMCS_LAUNCH_STATE_LAUNCHED);
+    bool const   fResumeVM = RT_BOOL(pVmcsInfo->fVmcsState == VMX_V_VMCS_LAUNCH_STATE_LAUNCHED);
 #ifdef VBOX_WITH_STATISTICS
     if (fResumeVM)
@@ -6262 +6262 @@
 
     pVCpu->hmr0.s.vmx.fRestoreHostFlags |= VMX_RESTORE_HOST_REQUIRED;   /* Some host state messed up by VMX needs restoring. */
-    pVmcsInfo->fVmcsState |= VMX_V_VMCS_LAUNCH_STATE_LAUNCHED;          /* Use VMRESUME instead of VMLAUNCH in the next run. */
+    pVmcsInfo->fVmcsState = VMX_V_VMCS_LAUNCH_STATE_LAUNCHED;           /* Use VMRESUME instead of VMLAUNCH in the next run. */
 #ifdef VBOX_STRICT
     hmR0VmxCheckHostEferMsr(pVmcsInfo);                                 /* Verify that the host EFER MSR wasn't modified. */
@@ -6444 +6444 @@
     RT_ZERO(VmxTransient);
     VmxTransient.pVmcsInfo = hmGetVmxActiveVmcsInfo(pVCpu);
+    Assert(!pVCpu->hmr0.s.vmx.fSwitchedToNstGstVmcs);
 
     /* Paranoia. */
@@ -6556 +6557 @@
     VmxTransient.pVmcsInfo      = hmGetVmxActiveVmcsInfo(pVCpu);
     VmxTransient.fIsNestedGuest = true;
+    Assert(pVCpu->hmr0.s.vmx.fSwitchedToNstGstVmcs);
 
     /* Paranoia. */