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

Timestamp:

Jun 18, 2014 11:08:40 AM (10 years ago)

Author:

vboxsync

Message:

VMM/GIM: Fix wrongly committed testing bits.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/GIMAllHv.cpp (modified) (1 diff)
• VMMR3/GIMHv.cpp (modified) (1 diff)

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

@@ -104 +104 @@
 
         case MSR_GIM_HV_TSC_FREQ:
-#ifndef IN_RING3
-            return VERR_EM_INTERPRETER;
-#else
-            LogRel(("GIM: MSR_GIM_HV_TSC_FREQ %u\n", TMCpuTicksPerSecond(pVM)));
-            //*puValue = TMCpuTicksPerSecond(pVM);
-            *puValue = 2690000000;
-            return VINF_SUCCESS;
-#endif
+            *puValue = TMCpuTicksPerSecond(pVM);
+            return VINF_SUCCESS;
 
         case MSR_GIM_HV_APIC_FREQ:

trunk/src/VBox/VMM/VMMR3/GIMHv.cpp

@@ -474 +474 @@
         uint64_t const u64TscKHz = TMCpuTicksPerSecond(pVM) / UINT64_C(1000);
         pRefTsc->u32TscSequence  = 1;
-        //pRefTsc->u64TscScale     = ((UINT64_C(10000) << 32) / u64TscKHz) << 32;
-        pRefTsc->u64TscScale     = 0xf4000000000000;
+        pRefTsc->u64TscScale     = ((UINT64_C(10000) << 32) / u64TscKHz) << 32;
 
         LogRel(("GIM: HyperV: Enabled TSC page at %#RGp (u64TscScale=%#RX64 u64TscKHz=%#RX64)\n", GCPhysTscPage,