Changeset 95065 in vbox for trunk

Timestamp:

May 23, 2022 8:06:47 PM (3 years ago)

Author:

vboxsync

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

151534

Message:

Main/Host::i_updateProcessorFeatures: SUPR0QueryVTCaps may return VERR_SUP_DRIVERLESS in driverless mode, so just deal with it as best as we can. bugref:10138

File:

• trunk/src/VBox/Main/src-server/HostImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -1198 +1198 @@
         uint32_t fVTCaps;
         rc = SUPR3QueryVTCaps(&fVTCaps);
-        AssertMsgRC(rc, ("SUPR3QueryVTCaps failed rc=%Rrc\n", rc));
+        AssertMsg(RT_SUCCESS(rc) || rc == VERR_SUP_DRIVERLESS, ("SUPR3QueryVTCaps failed rc=%Rrc\n", rc));
 
         SUPR3Term(false);
@@ -1205 +1205 @@
         if (RT_FAILURE(rc))
         {
-            LogRel(("SUPR0QueryVTCaps -> %Rrc\n", rc));
             fVTCaps = 0;
+            if (rc != VERR_SUP_DRIVERLESS)
+                LogRel(("SUPR0QueryVTCaps -> %Rrc\n", rc));
+# if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) /* Preserve detected VT-x/AMD-V support for show. */
+            else
+                fVTCaps = m->fVTSupported ? SUPVTCAPS_AMD_V | SUPVTCAPS_VT_X : 0;
+# endif
         }
         m->fVTSupported                = (fVTCaps & (SUPVTCAPS_AMD_V | SUPVTCAPS_VT_X)) != 0;