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

Timestamp:

Sep 29, 2017 4:13:26 PM (7 years ago)

Author:

vboxsync

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

118205

Message:

Main,VBoxManage: Changed the CPUID override methods on IMachine to take sub-leaves into account. Currently we do not support non-zero sub-leaves due to VMM, but that can be fixed later.

File:

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

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

@@ -2635 +2635 @@
  */
 CpuIdLeaf::CpuIdLeaf() :
-    ulId(UINT32_MAX),
-    ulEax(0),
-    ulEbx(0),
-    ulEcx(0),
-    ulEdx(0)
+    idx(UINT32_MAX),
+    idxSub(0),
+    uEax(0),
+    uEbx(0),
+    uEcx(0),
+    uEdx(0)
 {
 }
@@ -2651 +2652 @@
 {
     return (this == &c)
-        || (   ulId      == c.ulId
-            && ulEax     == c.ulEax
-            && ulEbx     == c.ulEbx
-            && ulEcx     == c.ulEcx
-            && ulEdx     == c.ulEdx);
+        || (   idx      == c.idx
+            && idxSub   == c.idxSub
+            && uEax     == c.uEax
+            && uEbx     == c.uEbx
+            && uEcx     == c.uEcx
+            && uEdx     == c.uEdx);
 }
 
@@ -3348 +3350 @@
         CpuIdLeaf leaf;
 
-        if (!pelmCpuIdLeaf->getAttributeValue("id", leaf.ulId))
+        if (!pelmCpuIdLeaf->getAttributeValue("id", leaf.idx))
             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);
+        if (!pelmCpuIdLeaf->getAttributeValue("subleaf", leaf.idxSub))
+            leaf.idxSub = 0;
+        pelmCpuIdLeaf->getAttributeValue("eax", leaf.uEax);
+        pelmCpuIdLeaf->getAttributeValue("ebx", leaf.uEbx);
+        pelmCpuIdLeaf->getAttributeValue("ecx", leaf.uEcx);
+        pelmCpuIdLeaf->getAttributeValue("edx", leaf.uEdx);
 
         ll.push_back(leaf);
@@ -5317 +5321 @@
 
         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);
+        pelmCpuIdLeaf->setAttribute("id",  leaf.idx);
+        if (leaf.idxSub != 0)
+            pelmCpuIdLeaf->setAttribute("subleaf",  leaf.idxSub);
+        pelmCpuIdLeaf->setAttribute("eax", leaf.uEax);
+        pelmCpuIdLeaf->setAttribute("ebx", leaf.uEbx);
+        pelmCpuIdLeaf->setAttribute("ecx", leaf.uEcx);
+        pelmCpuIdLeaf->setAttribute("edx", leaf.uEdx);
     }
 
@@ -6937 +6943 @@
             }
         }
+
+        for (CpuIdLeafsList::const_iterator it = hardwareMachine.llCpuIdLeafs.begin();
+             it != hardwareMachine.llCpuIdLeafs.end();
+             ++it)
+            if (it->idxSub != 0)
+            {
+                m->sv = SettingsVersion_v1_16;
+                return;
+            }
     }