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

Timestamp:

Mar 29, 2018 11:48:10 AM (7 years ago)

Author:

vboxsync

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

121545

Message:

VMM/HMSVMR0: Safer to use the TSC offset from TMCpuTickCanUseRealTSC only when it returns true (otherwise the value is uninitialized, although it's unused in practise).

File:

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

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

@@ -3031 +3031 @@
         pVmcbNstGstCtrl->u64InterceptCtrl &= ~(SVM_CTRL_INTERCEPT_RDTSC | SVM_CTRL_INTERCEPT_RDTSCP);
         STAM_COUNTER_INC(&pVCpu->hm.s.StatTscOffset);
+
+        /* Apply the nested-guest VMCB's TSC offset over the guest one. */
+        uTscOffset = HMSvmNstGstApplyTscOffset(pVCpu, uTscOffset);
+
+        /* Update the nested-guest VMCB with the combined TSC offset (of guest and nested-guest). */
+        pVmcbNstGstCtrl->u64TSCOffset = uTscOffset;
     }
     else
@@ -3037 +3043 @@
         STAM_COUNTER_INC(&pVCpu->hm.s.StatTscIntercept);
     }
-
-    /* Apply the nested-guest VMCB's TSC offset over the guest one. */
-    uTscOffset = HMSvmNstGstApplyTscOffset(pVCpu, uTscOffset);
-
-    /* Update the nested-guest VMCB with the combined TSC offset (of guest and nested-guest). */
-    pVmcbNstGstCtrl->u64TSCOffset = uTscOffset;
 
     /* Finally update the VMCB clean bits since we touched the intercepts as well as the TSC offset. */