Changeset 51896 in vbox for trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

Timestamp:

Jul 7, 2014 6:17:59 AM (10 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Trial; don't adjust TSC offset with paravirt TSC.

File:

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

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

@@ -5586 +5586 @@
         fOffsettedTsc = TMCpuTickCanUseRealTSC(pVCpu, &pVCpu->hm.s.vmx.u64TSCOffset, &fParavirtTsc);
 
+#if 1
+    if (fParavirtTsc)
+    {
 #if 0
-    if (fParavirtTsc)
-    {
         uint64_t const u64CurTsc   = ASMReadTSC();
         uint64_t const u64LastTick = TMCpuTickGetLastSeen(pVCpu);
@@ -5598 +5599 @@
 
         Assert(u64CurTsc + pVCpu->hm.s.vmx.u64TSCOffset >= u64LastTick);
+#endif
         rc = GIMR0UpdateParavirtTsc(pVM, pVCpu->hm.s.vmx.u64TSCOffset);
         AssertRC(rc);
@@ -5608 +5610 @@
     }
     else
-#endif
-
+#else
     if (fParavirtTsc)
         STAM_COUNTER_INC(&pVCpu->hm.s.StatTscParavirt);
+#endif
     if (fOffsettedTsc)
     {
@@ -7303 +7305 @@
             u32IntInfo         |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_NMI << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
 
-            hmR0VmxSetPendingEvent(pVCpu, u32IntInfo, 0 /* cbInstr */, 0 /* u32ErrCode */, 0 /* GCPtrFaultAddres */);
+            hmR0VmxSetPendingEvent(pVCpu, u32IntInfo, 0 /* cbInstr */, 0 /* u32ErrCode */, 0 /* GCPtrFaultAddress */);
             VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_NMI);
         }