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

Timestamp:

Apr 18, 2013 9:49:05 PM (12 years ago)

Author:

vboxsync

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

85125

Message:

Main: Introducing CPUPropertyType_LongMode + legacy band aid.

File:

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

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

@@ -1734 +1734 @@
           fSyntheticCpu(false),
           fPAE(false),
+          enmLongMode(HC_ARCH_BITS == 64 ? Hardware::LongMode_Enabled : Hardware::LongMode_Disabled),
           cCPUs(1),
           fCpuHotPlug(false),
@@ -1800 +1801 @@
                   && (fSyntheticCpu             == h.fSyntheticCpu)
                   && (fPAE                      == h.fPAE)
+                  && (enmLongMode               == h.enmLongMode)
                   && (cCPUs                     == h.cCPUs)
                   && (fCpuHotPlug               == h.fCpuHotPlug)
@@ -2537 +2539 @@
                 pelmCPUChild->getAttributeValue("enabled", hw.fPAE);
 
+            bool fLongMode;
+            if (   (pelmCPUChild = pelmHwChild->findChildElement("LongMode"))
+                && pelmCPUChild->getAttributeValue("enabled", fLongMode) )
+                hw.enmLongMode = fLongMode ? Hardware::LongMode_Enabled : Hardware::LongMode_Disabled;
+            else
+                hw.enmLongMode = Hardware::LongMode_Legacy;
+
             if ((pelmCPUChild = pelmHwChild->findChildElement("SyntheticCpu")))
                 pelmCPUChild->getAttributeValue("enabled", hw.fSyntheticCpu);
@@ -3701 +3710 @@
     pelmCPU->createChild("HardwareVirtExVPID")->setAttribute("enabled", hw.fVPID);
     pelmCPU->createChild("PAE")->setAttribute("enabled", hw.fPAE);
+    if (m->sv >= SettingsVersion_v1_14 && hw.enmLongMode != Hardware::LongMode_Legacy)
+        pelmCPU->createChild("LongMode")->setAttribute("enabled", hw.enmLongMode == Hardware::LongMode_Enabled);
 
     if (hw.fSyntheticCpu)
@@ -4990 +5001 @@
     {
         // VirtualBox 4.3 adds default frontend setting.
-        if (!hardwareMachine.strDefaultFrontend.isEmpty())
+        if (   !hardwareMachine.strDefaultFrontend.isEmpty()
+            || hardwareMachine.enmLongMode != Hardware::LongMode_Legacy)
             m->sv = SettingsVersion_v1_14;
     }