Changeset 31818 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 20, 2010 1:06:33 PM (14 years ago)

Author:

vboxsync

Message:

added HWVirtEx force property to API

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (2 diffs)
• MachineImpl.cpp (modified) (5 diffs)
• idl/VirtualBox.xidl (modified) (1 diff)
• include/MachineImpl.h (modified) (1 diff)
• xml/Settings.cpp (modified) (4 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -636 +636 @@
          */
         BOOL fHWVirtExEnabled;
-        BOOL fHwVirtExtForced;
+        BOOL fHwVirtExtForced = false;
 #ifdef VBOX_WITH_RAW_MODE
         hrc = pMachine->GetHWVirtExProperty(HWVirtExPropertyType_Enabled, &fHWVirtExEnabled); H();
@@ -652 +652 @@
 # endif
 #else  /* !VBOX_WITH_RAW_MODE */
-        fHWVirtExEnabled = fHwVirtExtForced = TRUE;
+        fHWVirtExEnabled = fHwVirtExtForced = true;
 #endif /* !VBOX_WITH_RAW_MODE */
+        /* only honor the property value if there was no other reason to enable it */
+        if (!fHwVirtExtForced)
+        {
+            hrc = pMachine->GetHWVirtExProperty(HWVirtExPropertyType_Force, &fHwVirtExtForced); H();
+        }
         InsertConfigInteger(pRoot, "HwVirtExtForced",      fHwVirtExtForced);
 

trunk/src/VBox/Main/MachineImpl.cpp

@@ -160 +160 @@
 #endif
     mHWVirtExVPIDEnabled = true;
+    mHWVirtExForceEnabled = false;
 #if defined(RT_OS_DARWIN) || defined(RT_OS_WINDOWS)
     mHWVirtExExclusive = false;
@@ -1965 +1966 @@
             *aVal = mHWData->mHWVirtExLargePagesEnabled;
             break;
+            
+        case HWVirtExPropertyType_Force:
+            *aVal = mHWData->mHWVirtExForceEnabled;
 
         default:
@@ -2014 +2018 @@
             break;
 
+        case HWVirtExPropertyType_Force:
+            setModified(IsModified_MachineData);
+            mHWData.backup();
+            mHWData->mHWVirtExForceEnabled = !!aVal;
+            break;
+            
         default:
             return E_INVALIDARG;
@@ -7022 +7032 @@
         mHWData->mHWVirtExLargePagesEnabled   = data.fLargePages;
         mHWData->mHWVirtExVPIDEnabled         = data.fVPID;
+        mHWData->mHWVirtExForceEnabled        = data.fHardwareVirtForce;
         mHWData->mPAEEnabled                  = data.fPAE;
         mHWData->mSyntheticCpu                = data.fSyntheticCpu;
@@ -8056 +8067 @@
         data.fLargePages            = !!mHWData->mHWVirtExLargePagesEnabled;
         data.fVPID                  = !!mHWData->mHWVirtExVPIDEnabled;
+        data.fHardwareVirtForce     = !!mHWData->mHWVirtExForceEnabled;
         data.fPAE                   = !!mHWData->mPAEEnabled;
         data.fSyntheticCpu          = !!mHWData->mSyntheticCpu;

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

@@ -906 +906 @@
       <desc>
         Whether large page allocation is enabled; requires nested paging and a 64 bits host.
+      </desc>
+    </const>
+    <const name="Force"               value="6">
+      <desc>
+        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>

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

@@ -257 +257 @@
         BOOL                 mHWVirtExLargePagesEnabled;
         BOOL                 mHWVirtExVPIDEnabled;
+        BOOL                 mHWVirtExForceEnabled;
         BOOL                 mAccelerate2DVideoEnabled;
         BOOL                 mPAEEnabled;

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

@@ -1534 +1534 @@
           fLargePages(false),
           fVPID(true),
+          fHardwareVirtForce(false),
           fSyntheticCpu(false),
           fPAE(false),
@@ -1580 +1581 @@
                   && (fLargePages               == h.fLargePages)
                   && (fVPID                     == h.fVPID)
+                  && (fHardwareVirtForce        == h.fHardwareVirtForce)
                   && (fSyntheticCpu             == h.fSyntheticCpu)
                   && (fPAE                      == h.fPAE)
@@ -2265 +2267 @@
             if ((pelmCPUChild = pelmHwChild->findChildElement("HardwareVirtExVPID")))
                 pelmCPUChild->getAttributeValue("enabled", hw.fVPID);
+            if ((pelmCPUChild = pelmHwChild->findChildElement("HardwareVirtForce")))
+                pelmCPUChild->getAttributeValue("enabled", hw.fHardwareVirtForce);            
 
             if (!(pelmCPUChild = pelmHwChild->findChildElement("PAE")))
@@ -3177 +3181 @@
     if (hw.fLargePages)
         pelmCPU->createChild("HardwareVirtExLargePages")->setAttribute("enabled", hw.fLargePages);
+    
+    if (m->sv >= SettingsVersion_v1_9)
+        pelmCPU->createChild("HardwareVirtForce")->setAttribute("enabled", hw.fHardwareVirtForce);    
 
     if (m->sv >= SettingsVersion_v1_10)