Changeset 24465 in vbox

Timestamp:

Nov 6, 2009 4:28:36 PM (15 years ago)

Author:

vboxsync

Message:

Respect the default value of PAE for pre 1.9 xml files.
Always write the PAE, VPID & nested paging settings to make it easier to change the defaults later on.

File:

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

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

@@ -1547 +1547 @@
             if ((pelmCPUChild = pelmHwChild->findChildElement("HardwareVirtExVPID")))
                 pelmCPUChild->getAttributeValue("enabled", hw.fVPID);
-            if ((pelmCPUChild = pelmHwChild->findChildElement("PAE")))
+
+            if (!(pelmCPUChild = pelmHwChild->findChildElement("PAE")))
+            {
+                /* The default for pre 3.1 was false, so we must respect that. */
+                if (m->sv < SettingsVersion_v1_9)
+                    hw.fPAE = false;
+            }
+            else
                 pelmCPUChild->getAttributeValue("enabled", hw.fPAE);
+
             if ((pelmCPUChild = pelmHwChild->findChildElement("SyntheticCpu")))
                 pelmCPUChild->getAttributeValue("enabled", hw.fSyntheticCpu);
@@ -2424 +2432 @@
         pelmHwVirtEx->setAttribute("exclusive", hw.fHardwareVirtExclusive);
 
-    if (hw.fNestedPaging)
-        pelmCPU->createChild("HardwareVirtExNestedPaging")->setAttribute("enabled", hw.fNestedPaging);
-    if (hw.fVPID)
-        pelmCPU->createChild("HardwareVirtExVPID")->setAttribute("enabled", hw.fVPID);
-    if (hw.fPAE)
-        pelmCPU->createChild("PAE")->setAttribute("enabled", hw.fPAE);
+    pelmCPU->createChild("HardwareVirtExNestedPaging")->setAttribute("enabled", hw.fNestedPaging);
+    pelmCPU->createChild("HardwareVirtExVPID")->setAttribute("enabled", hw.fVPID);
+    pelmCPU->createChild("PAE")->setAttribute("enabled", hw.fPAE);
+
     if (hw.fSyntheticCpu)
         pelmCPU->createChild("SyntheticCpu")->setAttribute("enabled", hw.fSyntheticCpu);