Changeset 72356 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

May 28, 2018 4:18:06 AM (7 years ago)

Author:

vboxsync

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

122813

Message:

Main: Add 'UnrestrictedGuest' to features enum while querying host CPU features. Fixed a minor bug in HostImpl when querying VT caps fails (almost likely to never happen though).

File:

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

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

@@ -217 +217 @@
                             fPAESupported,
                             fNestedPagingSupported,
+                            fUnrestrictedGuestSupported,
                             fRecheckVTSupported;
 
@@ -298 +299 @@
     m->fPAESupported = false;
     m->fNestedPagingSupported = false;
+    m->fUnrestrictedGuestSupported = false;
     m->fRecheckVTSupported = false;
 
@@ -351 +353 @@
                 {
                     m->fVTSupported = true;
+                    m->fUnrestrictedGuestSupported = true;
 
                     /* Query AMD features. */
@@ -380 +383 @@
                 else
                     Assert(m->fNestedPagingSupported == false);
+                if (   (fVTCaps & SUPVTCAPS_AMD_V)
+                    || (fVTCaps & SUPVTCAPS_VTX_UNRESTRICTED_GUEST))
+                    m->fUnrestrictedGuestSupported = true;
+                else
+                    Assert(m->fUnrestrictedGuestSupported == false);
             }
             else
             {
                 LogRel(("SUPR0QueryVTCaps -> %Rrc\n", rc));
-                m->fVTSupported = m->fNestedPagingSupported = false;
+                m->fVTSupported = m->fNestedPagingSupported = m->fUnrestrictedGuestSupported = false;
             }
             rc = SUPR3Term(false);
@@ -1008 +1016 @@
         case ProcessorFeature_LongMode:
         case ProcessorFeature_NestedPaging:
+        case ProcessorFeature_UnrestrictedGuest:
             break;
         default:
@@ -1022 +1031 @@
         if (   m->fRecheckVTSupported
             && (   aFeature == ProcessorFeature_HWVirtEx
-                || aFeature == ProcessorFeature_NestedPaging)
+                || aFeature == ProcessorFeature_NestedPaging
+                || aFeature == ProcessorFeature_UnrestrictedGuest)
            )
         {
@@ -1042 +1052 @@
                     else
                         Assert(m->fNestedPagingSupported == false);
+                    if (   (fVTCaps & SUPVTCAPS_AMD_V)
+                        || (fVTCaps & SUPVTCAPS_VTX_UNRESTRICTED_GUEST))
+                        m->fUnrestrictedGuestSupported = true;
+                    else
+                        Assert(m->fUnrestrictedGuestSupported == false);
                 }
                 else
                 {
                     LogRel(("SUPR0QueryVTCaps -> %Rrc\n", rc));
-                    m->fVTSupported = m->fNestedPagingSupported = true;
+                    m->fVTSupported = m->fNestedPagingSupported = m->fUnrestrictedGuestSupported = false;
                 }
                 rc = SUPR3Term(false);
@@ -1072 +1087 @@
             case ProcessorFeature_NestedPaging:
                 *aSupported = m->fNestedPagingSupported;
+                break;
+
+            case ProcessorFeature_UnrestrictedGuest:
+                *aSupported = m->fUnrestrictedGuestSupported;
                 break;