Changeset 102108 in vbox

Timestamp:

Nov 15, 2023 2:55:59 PM (17 months ago)

Author:

vboxsync

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

160229

Message:

ValidationKit: Fix for 7.1 API changes, bugref:10507

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• vbox.py (modified) (1 diff)
• vboxtestvms.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/testdriver/vbox.py

@@ -3843 +3843 @@
             return False;
 
-        (uFamilyModel, _, _, _) = self.oVBox.host.getProcessorCPUIDLeaf(0, 0x1, 0);
+        if self.fpApiVer >= 7.1:
+            (uFamilyModel, _, _, _) = self.oVBox.host.x86.getProcessorCPUIDLeaf(0, 0x1, 0);
+        else:
+            (uFamilyModel, _, _, _) = self.oVBox.host.getProcessorCPUIDLeaf(0, 0x1, 0);
         return ((uFamilyModel >> 8) & 0xf) == 0xf;
 

trunk/src/VBox/ValidationKit/testdriver/vboxtestvms.py

@@ -723 +723 @@
             return False;
         try:
-            (uMaxExt, _, _, _) = oTestDrv.oVBox.host.getProcessorCPUIDLeaf(0, 0x80000000, 0);
-            (uFamilyModel, _, _, _) = oTestDrv.oVBox.host.getProcessorCPUIDLeaf(0, 0x80000001, 0);
+            if self.fpApiVer >= 7.1:
+                (uMaxExt, _, _, _) = oTestDrv.oVBox.host.x86.getProcessorCPUIDLeaf(0, 0x80000000, 0);
+                (uFamilyModel, _, _, _) = oTestDrv.oVBox.host.x86.getProcessorCPUIDLeaf(0, 0x80000001, 0);
+            else:
+                (uMaxExt, _, _, _) = oTestDrv.oVBox.host.getProcessorCPUIDLeaf(0, 0x80000000, 0);
+                (uFamilyModel, _, _, _) = oTestDrv.oVBox.host.getProcessorCPUIDLeaf(0, 0x80000001, 0);
         except:
             reporter.logXcpt();
@@ -1431 +1435 @@
             return False;
         try:
-            (uMaxExt, _, _, _) = oTestDrv.oVBox.host.getProcessorCPUIDLeaf(0, 0x80000000, 0);
-            (uFamilyModel, _, _, _) = oTestDrv.oVBox.host.getProcessorCPUIDLeaf(0, 0x80000001, 0);
+            if self.fpApiVer >= 7.1:
+                (uMaxExt, _, _, _) = oTestDrv.oVBox.host.x86.getProcessorCPUIDLeaf(0, 0x80000000, 0);
+                (uFamilyModel, _, _, _) = oTestDrv.oVBox.host.x86.getProcessorCPUIDLeaf(0, 0x80000001, 0);
+            else:
+                (uMaxExt, _, _, _) = oTestDrv.oVBox.host.getProcessorCPUIDLeaf(0, 0x80000000, 0);
+                (uFamilyModel, _, _, _) = oTestDrv.oVBox.host.getProcessorCPUIDLeaf(0, 0x80000001, 0);
         except:
             reporter.logXcpt();