Changeset 102172 in vbox

Timestamp:

Nov 21, 2023 7:09:04 AM (12 months ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:10318 Trying to nail down the cause of the BSOD/assertions in Windows 10 with Hyper-V enabled.

File:

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

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

@@ -4398 +4398 @@
     bool         fParavirtTsc;
     uint64_t     uTscOffset;
-    PVMCC        pVM       = pVCpu->CTX_SUFF(pVM);
-    PVMXVMCSINFO pVmcsInfo = hmGetVmxActiveVmcsInfo(pVCpu);
+    PVMCC        pVM = pVCpu->CTX_SUFF(pVM);
 
     if (pVM->hmr0.s.vmx.fUsePreemptTimer)
@@ -4465 +4464 @@
         if (pVmxTransient->fIsNestedGuest)
             uTscOffset = CPUMApplyNestedGuestTscOffset(pVCpu, uTscOffset);
-        hmR0VmxSetTscOffsetVmcs(pVmcsInfo, uTscOffset);
+        hmR0VmxSetTscOffsetVmcs(pVmxTransient->pVmcsInfo, uTscOffset);
         hmR0VmxRemoveProcCtlsVmcs(pVCpu, pVmxTransient, VMX_PROC_CTLS_RDTSC_EXIT);
     }
@@ -4861 +4860 @@
     if (!CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.GstCtx))
     {
+        Assert(!pVCpu->hmr0.s.vmx.fSwitchedToNstGstVmcs);
         vmxHCClearIntWindowExitVmcs(pVCpu, pVmcsInfo);
         vmxHCClearNmiWindowExitVmcs(pVCpu, pVmcsInfo);