Changeset 57071 in vbox

Timestamp:

Jul 24, 2015 2:13:40 PM (9 years ago)

Author:

vboxsync

Message:

sup.h: added SUPIsHostVirtualized and some parameter nits to SUPIsTscFreqCompatible.

File:

• trunk/include/VBox/sup.h (modified) (4 diffs)

trunk/include/VBox/sup.h

@@ -35 +35 @@
 #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
 # include <iprt/asm-amd64-x86.h>
+# include <iprt/x86.h>
 #endif
 
@@ -585 +586 @@
  * frequency of the host.
  *
- * @param   u64CpuHz        The TSC frequency to check.
+ * @param   uCpuHz          The TSC frequency to check.
+ * @param   puGipCpuHz      Where to store the GIP TSC frequency used
+ *                          during the compatibility test (can be NULL).
  * @param   fRelax          Whether to use a more relaxed threshold (like
  *                          for when running in a virtualized environment).
@@ -591 +594 @@
  * @returns true if it's compatible, false otherwise.
  */
-DECLINLINE(bool) SUPIsTscFreqCompatible(uint64_t u64CpuHz, bool fRelax)
+DECLINLINE(bool) SUPIsTscFreqCompatible(uint64_t uCpuHz, uint64_t *puGipCpuHz, bool fRelax)
 {
     PSUPGLOBALINFOPAGE pGip = g_pSUPGlobalInfoPage;
     if (   pGip
-        && pGip->u32Mode == SUPGIPMODE_INVARIANT_TSC)
-        return SUPIsTscFreqCompatibleEx(pGip->u64CpuHz, u64CpuHz, fRelax);
+        && pGip->u32Mode != SUPGIPMODE_ASYNC_TSC)
+    {
+        uint64_t uGipCpuHz = pGip->u64CpuHz;
+        if (puGipCpuHz)
+            *puGipCpuHz = uGipCpuHz;
+        return SUPIsTscFreqCompatibleEx(uGipCpuHz, uCpuHz, fRelax);
+    }
     return false;
 }
@@ -605 +613 @@
 /** @internal */
 SUPDECL(uint64_t) SUPReadTscWithDelta(PSUPGLOBALINFOPAGE pGip);
+
+/**
+ * Checks if we are may be running in a virtualized environment.
+ *
+ * @returns true if the host system may be virtualized, false otherwise.
+ */
+DECLINLINE(bool) SUPIsHostVirtualized(void)
+{
+    Assert(ASMHasCpuId());
+    return RT_BOOL(ASMCpuId_ECX(1) & X86_CPUID_FEATURE_ECX_HVP);
+}
 
 /**