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

Timestamp:

Sep 19, 2023 12:55:37 PM (17 months ago)

Author:

vboxsync

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

159141

Message:

Main: Fixed reading the CPU properties (like CPU count). bugref:10384

File:

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

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

@@ -5302 +5302 @@
  *
  * @param elmPlatformOrHardware     Platform or Hardware node to read from.
+ * @param hw                        Where to store the hardware settings.
  * @param plat                      Where to store the platform settings.
  */
 void MachineConfigFile::readPlatform(const xml::ElementNode &elmPlatformOrHardware,
-                                     Platform &plat)
+                                     Hardware &hw, Platform &plat)
 {
     /*
@@ -5314 +5315 @@
     while ((pelmChild = nl1.forAllNodes()))
     {
-        if (pelmChild->nameEquals("Chipset"))
+        if (pelmChild->nameEquals("CPU"))
+        {
+            if (!pelmChild->getAttributeValue("count", hw.cCPUs))
+            {
+                // pre-1.5 variant; not sure if this actually exists in the wild anywhere
+                const xml::ElementNode *pelmCPUChild;
+                if ((pelmCPUChild = pelmChild->findChildElement("CPUCount")))
+                    pelmCPUChild->getAttributeValue("count", hw.cCPUs);
+            }
+
+            pelmChild->getAttributeValue("hotplug", hw.fCpuHotPlug);
+            pelmChild->getAttributeValue("executionCap", hw.ulCpuExecutionCap);
+
+            const xml::ElementNode *pelmCPUChild;
+            if (hw.fCpuHotPlug)
+            {
+                if ((pelmCPUChild = pelmChild->findChildElement("CpuTree")))
+                    readCpuTree(*pelmCPUChild, hw.llCpus);
+            }
+
+            if ((pelmCPUChild = pelmChild->findChildElement("SyntheticCpu")))
+            {
+                bool fSyntheticCpu = false;
+                pelmCPUChild->getAttributeValue("enabled", fSyntheticCpu);
+                hw.uCpuIdPortabilityLevel = fSyntheticCpu ? 1 : 0;
+            }
+            pelmChild->getAttributeValue("CpuIdPortabilityLevel", hw.uCpuIdPortabilityLevel);
+            pelmChild->getAttributeValue("CpuProfile", hw.strCpuProfile);
+        }
+        else if (pelmChild->nameEquals("Chipset"))
         {
             Utf8Str strChipsetType;
@@ -5467 +5497 @@
     while ((pelmHwChild = nl1.forAllNodes()))
     {
-        if (pelmHwChild->nameEquals("CPU"))
-        {
-            if (!pelmHwChild->getAttributeValue("count", hw.cCPUs))
-            {
-                // pre-1.5 variant; not sure if this actually exists in the wild anywhere
-                const xml::ElementNode *pelmCPUChild;
-                if ((pelmCPUChild = pelmHwChild->findChildElement("CPUCount")))
-                    pelmCPUChild->getAttributeValue("count", hw.cCPUs);
-            }
-
-            pelmHwChild->getAttributeValue("hotplug", hw.fCpuHotPlug);
-            pelmHwChild->getAttributeValue("executionCap", hw.ulCpuExecutionCap);
-
-            const xml::ElementNode *pelmCPUChild;
-            if (hw.fCpuHotPlug)
-            {
-                if ((pelmCPUChild = pelmHwChild->findChildElement("CpuTree")))
-                    readCpuTree(*pelmCPUChild, hw.llCpus);
-            }
-
-            if ((pelmCPUChild = pelmHwChild->findChildElement("SyntheticCpu")))
-            {
-                bool fSyntheticCpu = false;
-                pelmCPUChild->getAttributeValue("enabled", fSyntheticCpu);
-                hw.uCpuIdPortabilityLevel = fSyntheticCpu ? 1 : 0;
-            }
-            pelmHwChild->getAttributeValue("CpuIdPortabilityLevel", hw.uCpuIdPortabilityLevel);
-            pelmHwChild->getAttributeValue("CpuProfile", hw.strCpuProfile);
-        }
-        else if (pelmHwChild->nameEquals("Memory"))
+        if (pelmHwChild->nameEquals("Memory"))
         {
             pelmHwChild->getAttributeValue("RAMSize", hw.ulMemorySizeMB);
@@ -6114 +6115 @@
      * For newer settings (>= v1.20) we read the platform settings outside readHardware(). */
     if (m->sv < SettingsVersion_v1_20)
-        readPlatform(elmHardware, hw.platformSettings);
+        readPlatform(elmHardware, hw, hw.platformSettings);
 
     if (hw.ulMemorySizeMB == (uint32_t)-1)
@@ -6741 +6742 @@
             if (!(pelmPlatform = pElement->findChildElement("Platform")))
                 throw ConfigFileError(this, pElement, N_("Required Snapshot/@Platform element is missing"));
-            readPlatform(*pelmPlatform, pSnap->hardware.platformSettings);
+            readPlatform(*pelmPlatform, pSnap->hardware, pSnap->hardware.platformSettings);
         }
 
@@ -6944 +6945 @@
             if (!(pelmPlatform = elmMachine.findChildElement("Platform")))
                 throw ConfigFileError(this, &elmMachine, N_("Required Machine/@Platform element is missing"));
-            readPlatform(*pelmPlatform, hardwareMachine.platformSettings);
+            readPlatform(*pelmPlatform, hardwareMachine, hardwareMachine.platformSettings);
         }