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

Timestamp:

Jan 18, 2010 4:52:21 PM (15 years ago)

Author:

vboxsync

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

56716

Message:

CPU hotplug: Merge 4th patch. Implements the Main API and a VBoxManage interface to turn CPU hotplug on/off and to add/remove CPUs while the VM is running

File:

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

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

@@ -30 +30 @@
  *   3) In the settings writer method, write the setting _only_ if the current settings
  *      version (stored in m->sv) is high enough. That is, for VirtualBox 3.2, write it
- *      only if (m->sv >= SettingsVersion_v1_10).
+ *      only if (m->sv >= SettingsVersion_v1_11).
  *
  *   4) In MachineConfigFile::bumpSettingsVersionIfNeeded(), check if the new setting has
@@ -82 +82 @@
 
 /** VirtualBox XML settings version number substring ("x.y")  */
-#define VBOX_XML_VERSION        "1.9"
+#define VBOX_XML_VERSION        "1.11"
 
 /** VirtualBox XML settings version platform substring */
@@ -282 +282 @@
                 else if (ulMinor == 10)
                     m->sv = SettingsVersion_v1_10;
-                else if (ulMinor > 10)
+                else if (ulMinor == 11)
+                    m->sv = SettingsVersion_v1_11;
+                else if (ulMinor > 11)
                     m->sv = SettingsVersion_Future;
             }
@@ -302 +304 @@
         // creating new settings file:
         m->strSettingsVersionFull = VBOX_XML_VERSION_FULL;
-        m->sv = SettingsVersion_v1_10;
+        m->sv = SettingsVersion_v1_11;
     }
 }
@@ -556 +558 @@
 
         case SettingsVersion_v1_10:
+            pcszVersion = "1.10";
+            m->sv = SettingsVersion_v1_10;
+            break;
+
+        case SettingsVersion_v1_11:
         case SettingsVersion_Future:                // can be set if this code runs on XML files that were created by a future version of VBox;
                                                     // in that case, downgrade to current version when writing since we can't write future versions...
-            pcszVersion = "1.10";
-            m->sv = SettingsVersion_v1_10;
+            pcszVersion = "1.11";
+            m->sv = SettingsVersion_v1_11;
             break;
 
@@ -1263 +1270 @@
           fPAE(false),
           cCPUs(1),
+          fCpuHotPlug(false),
           ulMemorySizeMB((uint32_t)-1),
           ulVRAMSizeMB(8),
@@ -1284 +1292 @@
     fPAE = true;
 #endif
+}
+
+/**
+ * Called from MachineConfigFile::readHardware() to read cpu information.
+ * @param elmCpuid
+ * @param ll
+ */
+void MachineConfigFile::readCpuTree(const xml::ElementNode &elmCpu,
+                                    CpuList &ll)
+{
+    xml::NodesLoop nl1(elmCpu, "Cpu");
+    const xml::ElementNode *pelmCpu;
+    while ((pelmCpu = nl1.forAllNodes()))
+    {
+        Cpu cpu;
+
+        if (!pelmCpu->getAttributeValue("id", cpu.ulId))
+            throw ConfigFileError(this, pelmCpu, N_("Required Cpu/@id attribute is missing"));
+
+        ll.push_back(cpu);
+    }
 }
 
@@ -1560 +1589 @@
             }
 
+            pelmHwChild->getAttributeValue("hotplug", hw.fCpuHotPlug);
+
             const xml::ElementNode *pelmCPUChild;
+            if (hw.fCpuHotPlug)
+            {
+                if ((pelmCPUChild = pelmHwChild->findChildElement("CpuTree")))
+                    readCpuTree(*pelmCPUChild, hw.llCpus);
+            }
+
             if ((pelmCPUChild = pelmHwChild->findChildElement("HardwareVirtEx")))
             {
@@ -2468 +2505 @@
         pelmCPU->createChild("SyntheticCpu")->setAttribute("enabled", hw.fSyntheticCpu);
     pelmCPU->setAttribute("count", hw.cCPUs);
+
+    if (m->sv >= SettingsVersion_v1_11)
+    {
+        pelmCPU->setAttribute("hotplug", hw.fCpuHotPlug);
+
+        xml::ElementNode *pelmCpuTree = NULL;
+        for (CpuList::const_iterator it = hw.llCpus.begin();
+             it != hw.llCpus.end();
+             ++it)
+        {
+            const Cpu &cpu = *it;
+
+            if (pelmCpuTree == NULL)
+                 pelmCpuTree = pelmCPU->createChild("CpuTree");
+
+            xml::ElementNode *pelmCpu = pelmCpuTree->createChild("Cpu");
+            pelmCpu->setAttribute("id", cpu.ulId);
+        }
+    }
+
     xml::ElementNode *pelmCpuIdTree = NULL;
     for (CpuIdLeafsList::const_iterator it = hw.llCpuIdLeafs.begin();
@@ -3081 +3138 @@
        )
         m->sv = SettingsVersion_v1_10;
+
+    // Version 1.11 is required for CPU hotplugging
+    if (   (m->sv < SettingsVersion_v1_11)
+        && (hardwareMachine.fCpuHotPlug)
+       )
+        m->sv = SettingsVersion_v1_11;
 }