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

Timestamp:

Aug 14, 2020 12:59:51 PM (4 years ago)

Author:

vboxsync

Message:

Main: bugref:9618 Added Main/API support for AMD-V Virtualized VMSAVE/VMLOAD hardware virtualization feature.

File:

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

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

@@ -3349 +3349 @@
     fMDSClearOnVMEntry(false),
     fNestedHWVirt(false),
+    fVirtVmsaveVmload(true),
     enmLongMode(HC_ARCH_BITS == 64 ? Hardware::LongMode_Enabled : Hardware::LongMode_Disabled),
     cCPUs(1),
@@ -3470 +3471 @@
             && fMDSClearOnVMEntry             == h.fMDSClearOnVMEntry
             && fNestedHWVirt                  == h.fNestedHWVirt
+            && fVirtVmsaveVmload              == h.fVirtVmsaveVmload
             && cCPUs                          == h.cCPUs
             && fCpuHotPlug                    == h.fCpuHotPlug
@@ -4446 +4448 @@
             if ((pelmCPUChild = pelmHwChild->findChildElement("HardwareVirtExUseNativeApi")))
                 pelmCPUChild->getAttributeValue("enabled", hw.fUseNativeApi);
+            if ((pelmCPUChild = pelmHwChild->findChildElement("HardwareVirtExVirtVmsaveVmload")))
+                pelmCPUChild->getAttributeValue("enabled", hw.fVirtVmsaveVmload);
 
             if (!(pelmCPUChild = pelmHwChild->findChildElement("PAE")))
@@ -5898 +5902 @@
     if (m->sv >= SettingsVersion_v1_17 && hw.fNestedHWVirt)
         pelmCPU->createChild("NestedHWVirt")->setAttribute("enabled", hw.fNestedHWVirt);
+
+    if (m->sv >= SettingsVersion_v1_18 && !hw.fVirtVmsaveVmload)
+        pelmCPU->createChild("HardwareVirtExVirtVmsaveVmload")->setAttribute("enabled", hw.fVirtVmsaveVmload);
 
     if (m->sv >= SettingsVersion_v1_14 && hw.enmLongMode != Hardware::LongMode_Legacy)
@@ -7632 +7639 @@
         }
 
+        // VirtualBox 6.1 adds AMD-V virtualized VMSAVE/VMLOAD setting.
+        if (hardwareMachine.fVirtVmsaveVmload == false)
+        {
+            m->sv = SettingsVersion_v1_18;
+            return;
+        }
+
         // VirtualBox 6.1 adds a virtio-scsi storage controller.
         for (StorageControllersList::const_iterator it = hardwareMachine.storage.llStorageControllers.begin();