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

Timestamp:

Nov 3, 2009 5:11:08 PM (15 years ago)

Author:

vboxsync

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

54290

Message:

Added interfaces to override cpuid leafs.

Location:

trunk/src/VBox/Main/xml

Files:

• Settings.cpp (modified) (3 diffs)
• VirtualBox-settings-common.xsd (modified) (3 diffs)

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

@@ -1266 +1266 @@
 }
 
+/**
+ * Called from MachineConfigFile::readHardware() to cpuid information.
+ * @param elmCpuid
+ * @param ll
+ */
+void MachineConfigFile::readCpuIdTree(const xml::ElementNode &elmCpuid,
+                                      CpuIdLeafsList &ll)
+{
+    xml::NodesLoop nl1(elmCpuid, "CpuId");
+    const xml::ElementNode *pelmCpuIdLeaf;
+    while ((pelmCpuIdLeaf = nl1.forAllNodes()))
+    {
+        CpuIdLeaf leaf;
+
+        if (!pelmCpuIdLeaf->getAttributeValue("id", leaf.ulId))
+            throw ConfigFileError(this, pelmCpuIdLeaf, N_("Required CpuId/@id attribute is missing"));
+
+        pelmCpuIdLeaf->getAttributeValue("eax", leaf.ulEax);
+        pelmCpuIdLeaf->getAttributeValue("ebx", leaf.ulEbx);
+        pelmCpuIdLeaf->getAttributeValue("ecx", leaf.ulEcx);
+        pelmCpuIdLeaf->getAttributeValue("edx", leaf.ulEdx);
+
+        ll.push_back(leaf);
+    }
+}
 
 /**
@@ -1518 +1543 @@
             if ((pelmCPUChild = pelmHwChild->findChildElement("SyntheticCpu")))
                 pelmCPUChild->getAttributeValue("enabled", hw.fSyntheticCpu);
+            if ((pelmCPUChild = pelmHwChild->findChildElement("CpuIdTree")))
+                readCpuIdTree(*pelmHwChild, hw.llCpuIdLeafs);
         }
         else if (pelmHwChild->nameEquals("Memory"))
@@ -2399 +2426 @@
     pelmCPU->setAttribute("count", hw.cCPUs);
 
+    xml::ElementNode *pelmCpuIdTree = pelmHardware->createChild("CpuId");
+    for (CpuIdLeafsList::const_iterator it = hw.llCpuIdLeafs.begin();
+         it != hw.llCpuIdLeafs.end();
+         ++it)
+    {
+        const CpuIdLeaf &leaf = *it;
+
+        xml::ElementNode *pelmCpuIdLeaf = pelmCpuIdTree->createChild("CpuIdLeaf");
+        pelmCpuIdLeaf->setAttribute("id",  leaf.ulId);
+        pelmCpuIdLeaf->setAttribute("eax", leaf.ulEax);
+        pelmCpuIdLeaf->setAttribute("ebx", leaf.ulEbx);
+        pelmCpuIdLeaf->setAttribute("ecx", leaf.ulEcx);
+        pelmCpuIdLeaf->setAttribute("edx", leaf.ulEdx);
+    }
+
     xml::ElementNode *pelmMemory = pelmHardware->createChild("Memory");
     pelmMemory->setAttribute("RAMSize", hw.ulMemorySizeMB);

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -80 +80 @@
     </xsd:simpleType>
   </xsd:union>
+</xsd:simpleType>
+
+<xsd:simpleType name="TUInt32Hex">
+  <xsd:restriction base="xsd:string">
+    <xsd:pattern value="0x[A-Fa-f0-9]{1,8}"/>
+  </xsd:restriction>
 </xsd:simpleType>
 
@@ -461 +467 @@
 </xsd:simpleType>
 
+<xsd:complexType name="TCpuIdLeaf">
+  <xsd:attribute name="id"        type="TUInt32Hex"       use="required"/>
+  <xsd:attribute name="eax"       type="TUInt32Hex"       use="required"/>
+  <xsd:attribute name="ebx"       type="TUInt32Hex"       use="required"/>
+  <xsd:attribute name="ecx"       type="TUInt32Hex"       use="required"/>
+  <xsd:attribute name="edx"       type="TUInt32Hex"       use="required"/>
+</xsd:complexType>
+
+<xsd:complexType name="TCpuIdTree">
+  <xsd:sequence>
+    <xsd:element name="CpuIdLeaf" type="TCpuIdLeaf"
+                 minOccurs="0" maxOccurs="unbounded"/>
+  </xsd:sequence>
+</xsd:complexType>
+
 <xsd:complexType name="TCPU">
   <xsd:sequence>
@@ -468 +489 @@
     <xsd:element name="PAE" type="TPAEType" minOccurs="0"/>
     <xsd:element name="SyntheticCpu" type="TSyntheticCpuType" minOccurs="0"/>
+    <xsd:element name="CpuIdTree" type="TCpuIdTree" minOccurs="0"/>
   </xsd:sequence>
   <xsd:attribute name="count" type="TCPUCount" default="1"/>