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

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

120455

Message:

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

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (5 diffs)

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)
     {