webui

Timestamp:

May 30, 2016 4:11:26 PM (9 years ago)

Author:

vboxsync

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

107598

Message:

show march in testbox hover on the results page too. (untested)

Location:

trunk/src/VBox/ValidationKit/testmanager/webui

Files:

trunk/src/VBox/ValidationKit/testmanager/webui/wuireport.py

-              r61305
+              r61306
         sHtml += u'<td>%s</td>'    % (webutils.escapeElem(oTestBox.getArchBitString()),);
         sHtml += u'<td>%s</td>'    % (webutils.escapeElem(oTestBox.getPrettyCpuVendor()),);
+        sMarch = oTestBox.queryCpuMicroarch();
+        if sMarch is not None:
+            sHtml += u'<td>%s (%#x/%#x)' % (sMarch, oTestBox.getCpuModel(), oTestBox.getCpuStepping(),)
+        else:
+            sHtml += u'<td>fam%x %#x/%#x' % (oTestBox.getCpuFamily(), oTestBox.getCpuModel(), oTestBox.getCpuStepping(),)
+        sHtml += u'<td>%s'         % (oTestBox.getPrettyCpuVersion(),);
         if oTestBox.fCpuNestedPaging:   sHtml += u', np';
         elif oTestBox.fCpuHwVirt:       sHtml += u', hw';

-              r61278
+              r61306
             aoTestBoxRows.append(['CPU Name', oTestBox.sCpuName.replace('  ', ' ')]);
         if oTestBox.lCpuRevision is not None:
+            # ASSUMING x86+AMD64 versioning scheme here.
+            uFamily   = (oTestBox.lCpuRevision >> 24) & 0xff;
+            uModel    = (oTestBox.lCpuRevision >>  8) & 0xffff;
+            uStepping = oTestBox.lCpuRevision         & 0xff;
+            sMarch = oTestBox.queryCpuMicroarch();
+            if sMarch is not None:
+                aoTestBoxRows.append( ('CPU Microarch', sMarch) );
+            uFamily   = oTestBox.getCpuFamily();
+            uModel    = oTestBox.getCpuModel();
+            uStepping = oTestBox.getCpuStepping();
             aoTestBoxRows += [
                 ( 'CPU Family',   '%u (%#x)' % ( uFamily,   uFamily, ) ),

Note: See TracChangeset for help on using the changeset viewer.