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

Timestamp:

Jan 23, 2018 4:18:22 PM (7 years ago)

Author:

vboxsync

Message:

Main,VBoxManage: Added CPUPropertyType_HWVirt. Translates to --nested-hw-virt in VBoxManage/modifyvm

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -579 +579 @@
     </const>
     <const name="v1_17" value="19">
-      <desc>Settings version "1.17", written by VirtualBox 5.2.x.</desc>
+      <desc>Settings version "1.17", written by VirtualBox 6.0.x.</desc>
       <!--
-          So far absolutely no change to v1_16.
+          Machine changes: nested hardware virtualization.
       -->
     </const>
@@ -962 +962 @@
   <enum
     name="CPUPropertyType"
-    uuid="cc6ecdad-a07c-4e81-9c0e-d767e0678d5a"
+    uuid="3fcfe589-ca66-468f-e313-656f9d0b2eb6"
     >
     <desc>
@@ -1018 +1018 @@
         causing many VM exits, so it is only recommended for situation where there
         real need to be paranoid.
+      </desc>
+    </const>
+    <const name="HWVirt"                value="8">
+      <desc>
+        Enabled the hardware virtualization (AMD-V/VT-x) feature on the guest CPU.
+        This requires hardware virtualization on the host CPU.
       </desc>
     </const>

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

@@ -290 +290 @@
         BOOL                mIBPBOnVMExit;
         BOOL                mIBPBOnVMEntry;
+        BOOL                mNestedHWVirt;
         ULONG               mCPUCount;
         BOOL                mCPUHotPlugEnabled;

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1021 +1021 @@
             LogRel(("Limiting the firmware APIC level from APIC to Disabled\n"));
         }
+
+        /* Nested VT-x / AMD-V. */
+        BOOL fNestedHWVirt = FALSE;
+        hrc = pMachine->GetCPUProperty(CPUPropertyType_HWVirt, &fNestedHWVirt);      H();
+        InsertConfigInteger(pCPUM, "NestedHWVirt", fNestedHWVirt ? true : false);
 
         /*

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

@@ -198 +198 @@
     mIBPBOnVMExit = false;
     mIBPBOnVMEntry = false;
+    mNestedHWVirt = false;
     mHPETEnabled = false;
     mCpuExecutionCap = 100; /* Maximum CPU execution cap by default. */
@@ -2266 +2267 @@
             break;
 
+        case CPUPropertyType_HWVirt:
+            *aValue = mHWData->mNestedHWVirt;
+            break;
+
         default:
             return E_INVALIDARG;
@@ -2325 +2330 @@
             mHWData.backup();
             mHWData->mIBPBOnVMEntry = !!aValue;
+            break;
+
+        case CPUPropertyType_HWVirt:
+            i_setModified(IsModified_MachineData);
+            mHWData.backup();
+            mHWData->mNestedHWVirt = !!aValue;
             break;
 
@@ -9012 +9023 @@
         mHWData->mIBPBOnVMExit                = data.fIBPBOnVMExit;
         mHWData->mIBPBOnVMEntry               = data.fIBPBOnVMEntry;
+        mHWData->mNestedHWVirt                = data.fNestedHWVirt;
         mHWData->mCPUCount                    = data.cCPUs;
         mHWData->mCPUHotPlugEnabled           = data.fCpuHotPlug;
@@ -10337 +10349 @@
         data.fIBPBOnVMExit          = !!mHWData->mIBPBOnVMExit;
         data.fIBPBOnVMEntry         = !!mHWData->mIBPBOnVMEntry;
+        data.fNestedHWVirt          = !!mHWData->mNestedHWVirt;
         data.cCPUs                  = mHWData->mCPUCount;
         data.fCpuHotPlug            = !!mHWData->mCPUHotPlugEnabled;

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

@@ -2780 +2780 @@
     fIBPBOnVMExit(false),
     fIBPBOnVMEntry(false),
+    fNestedHWVirt(false),
     enmLongMode(HC_ARCH_BITS == 64 ? Hardware::LongMode_Enabled : Hardware::LongMode_Disabled),
     cCPUs(1),
@@ -2935 +2936 @@
             && fIBPBOnVMExit             == h.fIBPBOnVMExit
             && fIBPBOnVMEntry            == h.fIBPBOnVMEntry
+            && fNestedHWVirt             == h.fNestedHWVirt
             && cCPUs                     == h.cCPUs
             && fCpuHotPlug               == h.fCpuHotPlug
@@ -3943 +3945 @@
                 pelmCPUChild->getAttributeValue("vmentry", hw.fIBPBOnVMEntry);
             }
+            pelmCPUChild = pelmHwChild->findChildElement("NestedHWVirt");
+            if (pelmCPUChild)
+                pelmCPUChild->getAttributeValue("enabled", hw.fNestedHWVirt);
 
             if ((pelmCPUChild = pelmHwChild->findChildElement("CpuIdTree")))
@@ -5278 +5283 @@
         }
     }
+    if (m->sv >= SettingsVersion_v1_17 && hw.fNestedHWVirt)
+        pelmCPU->createChild("NestedHWVirt")->setAttribute("enabled", hw.fNestedHWVirt);
+
     if (m->sv >= SettingsVersion_v1_14 && hw.enmLongMode != Hardware::LongMode_Legacy)
     {
@@ -6939 +6947 @@
 void MachineConfigFile::bumpSettingsVersionIfNeeded()
 {
+    if (m->sv < SettingsVersion_v1_17)
+    {
+        // VirtualBox 6.0 adds nested hardware virtualization.
+        if (hardwareMachine.fNestedHWVirt)
+        {
+            m->sv = SettingsVersion_v1_17;
+            return;
+        }
+    }
+
     if (m->sv < SettingsVersion_v1_16)
     {