Changeset 72326 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

May 24, 2018 6:56:44 PM (7 years ago)

Author:

vboxsync

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

122782

Message:

Main,SUPLib: Report both HwVirt and NestedPaging capabilities when NEM is available on windows. bugref:9044

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPLib.cpp (modified) (1 diff)
• SUPLibInternal.h (modified) (1 diff)
• win/SUPLib-win.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -1706 +1706 @@
 
 
+SUPR3DECL(bool) SUPR3IsNemSupportedWhenNoVtxOrAmdV(void)
+{
+#ifdef RT_OS_WINDOWS
+    return suplibOsIsNemSupportedWhenNoVtxOrAmdV();
+#else
+    return false;
+#endif
+}
+
+
 SUPR3DECL(int) SUPR3QueryMicrocodeRev(uint32_t *uMicrocodeRev)
 {

trunk/src/VBox/HostDrivers/Support/SUPLibInternal.h

@@ -362 +362 @@
 int     suplibOsPageFree(PSUPLIBDATA pThis, void *pvPages, size_t cPages);
 int     suplibOsQueryVTxSupported(const char **ppszWhy);
+bool    suplibOsIsNemSupportedWhenNoVtxOrAmdV(void);
 
 

trunk/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp

@@ -49 +49 @@
 #include <VBox/log.h>
 #include <iprt/assert.h>
+#ifndef VBOX_WITH_HARDENING
+# include <iprt/x86.h>
+# include <iprt/ldr.h>
+#endif
 #include <iprt/path.h>
 #include <iprt/string.h>
@@ -741 +745 @@
 
 
+bool suplibOsIsNemSupportedWhenNoVtxOrAmdV(void)
+{
+# if ARCH_BITS == 64
+    /*
+     * Check that we're in a VM.
+     */
+    if (!ASMHasCpuId())
+        return false;
+    if (!ASMIsValidStdRange(ASMCpuId_EAX(0)))
+        return false;
+    if (!(ASMCpuId_ECX(1) & X86_CPUID_FEATURE_ECX_HVP))
+        return false;
+
+    /*
+     * Try load WinHvPlatform and resolve API for checking.
+     * Note! The two size_t arguments and the ssize_t one are all too big, but who cares.
+     */
+    RTLDRMOD hLdrMod = NIL_RTLDRMOD;
+    int rc = RTLdrLoadSystem("WinHvPlatform.dll", false, &hLdrMod);
+    if (RT_FAILURE(rc))
+        return false;
+
+    bool fRet = false;
+    typedef HRESULT (WINAPI *PFNWHVGETCAPABILITY)(ssize_t, void *, size_t, size_t *);
+    PFNWHVGETCAPABILITY pfnWHvGetCapability = (PFNWHVGETCAPABILITY)RTLdrGetFunction(hLdrMod, "WHvGetCapability");
+    if (pfnWHvGetCapability)
+    {
+        /*
+         * Query the API.
+         */
+        union
+        {
+            BOOL fHypervisorPresent;
+            uint64_t u64Padding;
+        } Caps;
+        RT_ZERO(Caps);
+        size_t cbRetIgn = 0;
+        HRESULT hrc = pfnWHvGetCapability(0 /*WHvCapabilityCodeHypervisorPresent*/, &Caps, sizeof(Caps), &cbRetIgn);
+        if (SUCCEEDED(hrc) && Caps.fHypervisorPresent)
+            fRet = true;
+    }
+
+    RTLdrClose(hLdrMod);
+    return fRet;
+# else
+    return false;
+#endif
+}
+
+
 # ifndef USE_NT_DEVICE_IO_CONTROL_FILE
 /**