Changeset 72332 in vbox for trunk/src

Timestamp:

May 24, 2018 8:51:23 PM (7 years ago)

Author:

vboxsync

Message:

Main: Added HWVirtExPropertyType::UseNativeApi for use with IMachine::getHWVirtExProperty and IMachine::setHWVirtExProperty. bugref:9044

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• include/MachineImpl.h (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (6 diffs)
• xml/Settings.cpp (modified) (5 diffs)

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

@@ -1056 +1056 @@
   <enum
     name="HWVirtExPropertyType"
-    uuid="411ad0ea-aeeb-44cb-9d03-1624d0d025ac"
+    uuid="bc05551e-e288-467e-1ea3-233de08e4480"
     >
     <desc>
@@ -1096 +1096 @@
         Whether the VM should fail to start if hardware virtualization (VT-x/AMD-V) cannot be used. If
         not set, there will be an automatic fallback to software virtualization.
+      </desc>
+    </const>
+    <const name="UseNativeApi"          value="7">
+      <desc>
+        Use the native hypervisor API instead of the VirtualBox one (HM) for VT-X/AMD-V.  This is
+        ignored if <link to="HWVirtExPropertyType::Enabled"/> isn't set.
       </desc>
     </const>

trunk/src/VBox/Main/include/MachineImpl.h

@@ -282 +282 @@
         BOOL                mHWVirtExUXEnabled;
         BOOL                mHWVirtExForceEnabled;
+        BOOL                mHWVirtExUseNativeApi;
         BOOL                mAccelerate2DVideoEnabled;
         BOOL                mPAEEnabled;

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

@@ -187 +187 @@
     mHWVirtExUXEnabled = true;
     mHWVirtExForceEnabled = false;
+    mHWVirtExUseNativeApi = false;
 #if HC_ARCH_BITS == 64 || defined(RT_OS_WINDOWS) || defined(RT_OS_DARWIN)
     mPAEEnabled = true;
@@ -2552 +2553 @@
             break;
 
+        case HWVirtExPropertyType_UseNativeApi:
+            *aValue = mHWData->mHWVirtExUseNativeApi;
+            break;
+
         default:
             return E_INVALIDARG;
@@ -2565 +2570 @@
     if (FAILED(rc)) return rc;
 
-    switch(aProperty)
+    switch (aProperty)
     {
         case HWVirtExPropertyType_Enabled:
@@ -2601 +2606 @@
             mHWData.backup();
             mHWData->mHWVirtExForceEnabled = !!aValue;
+            break;
+
+        case HWVirtExPropertyType_UseNativeApi:
+            i_setModified(IsModified_MachineData);
+            mHWData.backup();
+            mHWData->mHWVirtExUseNativeApi = !!aValue;
             break;
 
@@ -9042 +9053 @@
         mHWData->mHWVirtExUXEnabled           = data.fUnrestrictedExecution;
         mHWData->mHWVirtExForceEnabled        = data.fHardwareVirtForce;
+        mHWData->mHWVirtExUseNativeApi        = data.fUseNativeApi;
         mHWData->mPAEEnabled                  = data.fPAE;
         mHWData->mLongMode                    = data.enmLongMode;
@@ -10370 +10382 @@
         data.fUnrestrictedExecution = !!mHWData->mHWVirtExUXEnabled;
         data.fHardwareVirtForce     = !!mHWData->mHWVirtExForceEnabled;
+        data.fUseNativeApi          = !!mHWData->mHWVirtExUseNativeApi;
         data.fPAE                   = !!mHWData->mPAEEnabled;
         data.enmLongMode            = mHWData->mLongMode;

trunk/src/VBox/Main/xml/Settings.cpp

@@ -2774 +2774 @@
     fUnrestrictedExecution(true),
     fHardwareVirtForce(false),
+    fUseNativeApi(false),
     fTripleFaultReset(false),
     fPAE(false),
@@ -2931 +2932 @@
             && fUnrestrictedExecution    == h.fUnrestrictedExecution
             && fHardwareVirtForce        == h.fHardwareVirtForce
+            && fUseNativeApi             == h.fUseNativeApi
             && fPAE                      == h.fPAE
             && enmLongMode               == h.enmLongMode
@@ -3908 +3910 @@
             if ((pelmCPUChild = pelmHwChild->findChildElement("HardwareVirtForce")))
                 pelmCPUChild->getAttributeValue("enabled", hw.fHardwareVirtForce);
+            if ((pelmCPUChild = pelmHwChild->findChildElement("HardwareVirtExUseNativeApi")))
+                pelmCPUChild->getAttributeValue("enabled", hw.fUseNativeApi);
 
             if (!(pelmCPUChild = pelmHwChild->findChildElement("PAE")))
@@ -5333 +5337 @@
             pelmCPU->createChild("HardwareVirtForce")->setAttribute("enabled", hw.fHardwareVirtForce);
     }
+
+    if (m->sv >= SettingsVersion_v1_9 && hw.fUseNativeApi)
+        pelmCPU->createChild("HardwareVirtExUseNativeApi")->setAttribute("enabled", hw.fUseNativeApi);
 
     if (m->sv >= SettingsVersion_v1_10)
@@ -6964 +6971 @@
     if (m->sv < SettingsVersion_v1_17)
     {
-        // VirtualBox 6.0 adds nested hardware virtualization.
-        if (hardwareMachine.fNestedHWVirt)
+        // VirtualBox 6.0 adds nested hardware virtualization, using native API (NEM).
+        if (   hardwareMachine.fNestedHWVirt
+            || hardwareMachine.fUseNativeApi)
         {
             m->sv = SettingsVersion_v1_17;