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

Timestamp:

Oct 26, 2018 3:48:34 PM (6 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Nested VMX: bugref:9180 Adjust TSC offset.

File:

• trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -2836 +2836 @@
 #ifndef IN_RC
     PCCPUMCTX pCtx = &pVCpu->cpum.s.Guest;
+    if (CPUMIsGuestInVmxNonRootMode(pCtx))
+    {
+        PCVMXVVMCS pVmcs = pCtx->hwvirt.vmx.CTX_SUFF(pVmcs);
+        if (pVmcs->u32ProcCtls & VMX_PROC_CTLS_USE_TSC_OFFSETTING)
+            return uTicks + pVmcs->u64TscOffset.u;
+        return uTicks;
+    }
+
     if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
     {
@@ -2845 +2853 @@
         return HMSvmNstGstApplyTscOffset(pVCpu, uTicks);
     }
-
-    /** @todo Intel. */
 #else
     RT_NOREF(pVCpu);