Changeset 57078 in vbox for trunk/include

Timestamp:

Jul 24, 2015 8:16:59 PM (10 years ago)

Author:

vboxsync

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

101800

Message:

sup,iprt: SUPIsHostVirtualized belongs in IPRT and does not need to be inlined. Created RTSystemIsInserideVM() with simple amd64+x86 implementation.

Location:

trunk/include

Files:

• VBox/sup.h (modified) (5 diffs)
• iprt/system.h (modified) (1 diff)

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
 
@@ -556 +555 @@
  * Worker for SUPIsTscFreqCompatible().
  *
+ * @returns true if it's compatible, false otherwise.
  * @param   uBaseCpuHz      The reference CPU frequency of the system.
  * @param   uCpuHz          The CPU frequency to compare with the base.
@@ -561 +561 @@
  *                          for when running in a virtualized environment).
  *
- * @returns true if it's compatible, false otherwise.
  * @remarks Don't use directly, use SUPIsTscFreqCompatible() instead. This is
  *          to be used by tstGIP-2 or the like.
+ *
+ * @todo    r=bird: There is no need to inline this, is there? Move to
+ *          SUPLibAll.cpp
  */
 DECLINLINE(bool) SUPIsTscFreqCompatibleEx(uint64_t uBaseCpuHz, uint64_t uCpuHz, bool fRelax)
@@ -586 +588 @@
  * frequency of the host.
  *
+ * @returns true if it's compatible, false otherwise.
  * @param   uCpuHz          The TSC frequency to check.
  * @param   puGipCpuHz      Where to store the GIP TSC frequency used
- *                          during the compatibility test (can be NULL).
+ *                          during the compatibility test - optional.
  * @param   fRelax          Whether to use a more relaxed threshold (like
  *                          for when running in a virtualized environment).
  *
- * @returns true if it's compatible, false otherwise.
+ * @todo    r=bird: There is no need to inline this, is there? Move to
+ *          SUPLibAll.cpp
  */
 DECLINLINE(bool) SUPIsTscFreqCompatible(uint64_t uCpuHz, uint64_t *puGipCpuHz, bool fRelax)
@@ -613 +617 @@
 /** @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);
-}
 
 /**

trunk/include/iprt/system.h

@@ -243 +243 @@
 RTDECL(int) RTSystemShutdown(RTMSINTERVAL cMsDelay, uint32_t fFlags, const char *pszLogMsg);
 
+/**
+ * Checks if we're executing inside a virtual machine (VM).
+ *
+ * The current implemention is very simplistic and won't try to detect the
+ * precense of a virtual machien monitor (VMM) unless it openly tells us it is
+ * there.
+ *
+ * @returns true if inside a VM, false if on real hardware.
+ *
+ * @todo    If more information is needed, like which VMM it is and which
+ *          version and stuch, add one or two  new APIs.
+ */
+RTDECL(bool) RTSystemIsInsideVM(void);
+
 /** @} */