Changeset 23702 in vbox for trunk/src/VBox

Timestamp:

Oct 12, 2009 3:28:56 PM (15 years ago)

Author:

vboxsync

Message:

Query VT capabilities from the support driver.

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (6 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -167 +167 @@
 #endif
     /* Features that can be queried with GetProcessorFeature */
-    BOOL                    fVTxAMDVSupported,
+    BOOL                    fVTSupported,
                             fLongModeSupported,
-                            fPAESupported;
+                            fPAESupported,
+                            fNestedPagingSupported;
 
     /* 3D hardware acceleration supported? */
@@ -247 +248 @@
 
     /* Cache the features reported by GetProcessorFeature. */
-    m->fVTxAMDVSupported = false;
+    m->fVTSupported = false;
     m->fLongModeSupported = false;
     m->fPAESupported = false;
+    m->fNestedPagingSupported = false;
 
     if (ASMHasCpuId())
@@ -278 +280 @@
                 int rc = SUPR3QueryVTxSupported();
                 if (RT_SUCCESS(rc))
-                    m->fVTxAMDVSupported = true;
+                    m->fVTSupported = true;
             }
         }
@@ -291 +293 @@
                 && (u32FeaturesEDX & X86_CPUID_FEATURE_EDX_FXSR)
                )
-                m->fVTxAMDVSupported = true;
-        }
-    }
+                m->fVTSupported = true;
+        }
+    }
+
+#if 0 /* needs testing */
+    if (m->fVTSupported)
+    {
+        uint32_t u32Caps = 0;
+
+        int rc = SUPR3QueryVTCaps(&u32Caps);
+        if (VBOX_SUCCESS(rc))
+        {
+            if (u32Caps & SUPVTCAPS_NESTED_PAGING)
+                m->fNestedPagingSupported = true;
+        }
+        /* else @todo; report BIOS trouble in some way. */
+    }
+#endif
 
     /* Test for 3D hardware acceleration support */
@@ -1025 +1042 @@
     {
         case ProcessorFeature_HWVirtEx:
-            *aSupported = m->fVTxAMDVSupported;
+            *aSupported = m->fVTSupported;
             break;
 
@@ -1034 +1051 @@
         case ProcessorFeature_LongMode:
             *aSupported = m->fLongModeSupported;
+            break;
+
+        case ProcessorFeature_NestedPaging:
+            *aSupported = m->fNestedPagingSupported;
             break;
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -972 +972 @@
   <enum
     name="ProcessorFeature"
-    uuid="b8353b35-705d-4796-9967-ebfb7ba54af4"
+    uuid="64c38e6b-8bcf-45ad-ac03-9b406287c5bf"
   >
     <desc>
@@ -981 +981 @@
     <const name="PAE"             value="1"/>
     <const name="LongMode"        value="2"/>
+    <const name="NestedPaging"    value="3"/>
   </enum>