Changeset 57075 in vbox for trunk/src/VBox

Timestamp:

Jul 24, 2015 4:27:27 PM (9 years ago)

Author:

vboxsync

Message:

VMM/TM: Code to handle loading saved-states with different host TSC frequency, disabled for now.

File:

• trunk/src/VBox/VMM/VMMR3/TM.cpp (modified) (1 diff)

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

@@ -1349 +1349 @@
     if (pVM->tm.s.enmTSCMode != TMTSCMODE_REAL_TSC_OFFSET)
         pVM->tm.s.cTSCTicksPerSecond = u64Hz;
-    /** @todo Compare with real TSC rate even when restoring with real-tsc-offset
-     *        mode. */
 
     LogRel(("TM: cTSCTicksPerSecond=%#RX64 (%'RU64) enmTSCMode=%d (%s) (state load)\n",
             pVM->tm.s.cTSCTicksPerSecond, pVM->tm.s.cTSCTicksPerSecond, pVM->tm.s.enmTSCMode, tmR3GetTSCModeName(pVM)));
+
+    /* Disabled as this isn't tested, also should this apply only if GIM is enabled etc. */
+#if 0
+    /*
+     * If the current host TSC frequency is incompatible with what is in the
+     * saved state of the VM, fall back to emulating TSC and disallow TSC mode
+     * switches during VM runtime (e.g. by GIM).
+     */
+    uint64_t uGipCpuHz;
+    bool fRelax  = SUPIsHostVirtualized();
+    bool fCompat = SUPIsTscFreqCompatible(pVM->tm.s.cTSCTicksPerSecond, &uGipCpuHz, fRelax);
+    if (!fCompat)
+    {
+        pVM->tm.s.enmTSCMode = TMTSCMODE_VIRT_TSC_EMULATED;
+        pVM->tm.s.fTSCModeSwitchAllowed = false;
+        if (g_pSUPGlobalInfoPage->u32Mode != SUPGIPMODE_ASYNC_TSC)
+        {
+            LogRel(("TM: TSC frequency incompatible! uGipCpuHz=%#RX64 (%'RU64) enmTSCMode=%d (%s) fTSCModeSwitchAllowed=%RTbool (state load)\n",
+                    uGipCpuHz, uGipCpuHz, pVM->tm.s.enmTSCMode, tmR3GetTSCModeName(pVM), pVM->tm.s.fTSCModeSwitchAllowed));
+        }
+        else
+        {
+            LogRel(("TM: GIP is async, enmTSCMode=%d (%s) fTSCModeSwitchAllowed=%RTbool (state load)\n",
+                    uGipCpuHz, uGipCpuHz, pVM->tm.s.enmTSCMode, tmR3GetTSCModeName(pVM), pVM->tm.s.fTSCModeSwitchAllowed));
+        }
+    }
+#endif
 
     /*