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

Timestamp:

Jan 29, 2018 7:46:15 AM (7 years ago)

Author:

vboxsync

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

120555

Message:

VMM: Nested Hw.virt: Pick up the TSC offset from the original VMCB while applying the nested-guest TSC offset, rather
than the potentially modified VMCB.

File:

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

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

@@ -2911 +2911 @@
     Assert(CPUMIsGuestInSvmNestedHwVirtMode(pCtx));
 
-    bool                 fParavirtTsc;
-    uint64_t             uTscOffset;
-    bool fCanUseRealTsc = TMCpuTickCanUseRealTSC(pVM, pVCpu, &uTscOffset, &fParavirtTsc);
-
+    bool       fParavirtTsc;
+    uint64_t   uTscOffset;
+    bool const fCanUseRealTsc = TMCpuTickCanUseRealTSC(pVM, pVCpu, &uTscOffset, &fParavirtTsc);
+
+    PSVMVMCBCTRL         pVmcbNstGstCtrl  = &pVmcbNstGst->ctrl;
     PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-    PSVMVMCBCTRL         pVmcbNstGstCtrl  = &pVmcbNstGst->ctrl;
+    Assert(pCtx->hwvirt.svm.fHMCachedVmcb);
 
     /*
@@ -2937 +2938 @@
 
     /* Apply the nested-guest VMCB's TSC offset over the guest one. */
-    uTscOffset = CPUMApplyNestedGuestTscOffset(pVCpu, uTscOffset);
+    uTscOffset = HMSvmNstGstApplyTscOffset(pVCpu, uTscOffset);
 
     /* Update the nested-guest VMCB with the combined TSC offset (of guest and nested-guest). */