Changeset 75919 in vbox for trunk/src/VBox/Main/src-server/HostImpl.cpp

Timestamp:

Dec 3, 2018 5:27:41 PM (6 years ago)

Author:

vboxsync

Message:

Main/Host: add new feature check for nested virtualization

File:

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

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

@@ -218 +218 @@
                             fNestedPagingSupported,
                             fUnrestrictedGuestSupported,
+                            fNestedHWVirtSupported,
                             fRecheckVTSupported;
 
@@ -300 +301 @@
     m->fNestedPagingSupported = false;
     m->fUnrestrictedGuestSupported = false;
+    m->fNestedHWVirtSupported = false;
     m->fRecheckVTSupported = false;
 
@@ -388 +390 @@
                 else
                     Assert(m->fUnrestrictedGuestSupported == false);
+                /** @todo r=klaus put accurate condition here and update it as
+                 * the feature becomes available with VT-x. */
+                if (   (fVTCaps & SUPVTCAPS_AMD_V)
+                    && m->fNestedPagingSupported)
+                    m->fNestedHWVirtSupported = true;
             }
             else
             {
                 LogRel(("SUPR0QueryVTCaps -> %Rrc\n", rc));
-                m->fVTSupported = m->fNestedPagingSupported = m->fUnrestrictedGuestSupported = false;
+                m->fVTSupported = m->fNestedPagingSupported = m->fUnrestrictedGuestSupported
+                    = m->fNestedHWVirtSupported = false;
             }
             rc = SUPR3Term(false);
@@ -1017 +1025 @@
         case ProcessorFeature_NestedPaging:
         case ProcessorFeature_UnrestrictedGuest:
+        case ProcessorFeature_NestedHWVirt:
             break;
         default:
@@ -1032 +1041 @@
             && (   aFeature == ProcessorFeature_HWVirtEx
                 || aFeature == ProcessorFeature_NestedPaging
-                || aFeature == ProcessorFeature_UnrestrictedGuest)
+                || aFeature == ProcessorFeature_UnrestrictedGuest
+                || aFeature == ProcessorFeature_NestedHWVirt)
            )
         {
@@ -1057 +1067 @@
                     else
                         Assert(m->fUnrestrictedGuestSupported == false);
+                    /** @todo r=klaus put accurate condition here and update it as
+                     * the feature becomes available with VT-x. */
+                    if (   (fVTCaps & SUPVTCAPS_AMD_V)
+                        && m->fNestedPagingSupported)
+                        m->fNestedHWVirtSupported = true;
                 }
                 else
                 {
                     LogRel(("SUPR0QueryVTCaps -> %Rrc\n", rc));
-                    m->fVTSupported = m->fNestedPagingSupported = m->fUnrestrictedGuestSupported = false;
+                    m->fVTSupported = m->fNestedPagingSupported = m->fUnrestrictedGuestSupported
+                        = m->fNestedHWVirtSupported = false;
                 }
                 rc = SUPR3Term(false);
@@ -1091 +1107 @@
             case ProcessorFeature_UnrestrictedGuest:
                 *aSupported = m->fUnrestrictedGuestSupported;
+                break;
+
+            case ProcessorFeature_NestedHWVirt:
+                *aSupported = m->fNestedHWVirtSupported;
                 break;