Changeset 61305 in vbox for trunk/src/VBox/ValidationKit/testmanager/webui

Timestamp:

May 30, 2016 3:52:23 PM (9 years ago)

Author:

vboxsync

Message:

wuireport.py: march

File:

• trunk/src/VBox/ValidationKit/testmanager/webui/wuireport.py (modified) (1 diff)

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

@@ -593 +593 @@
         sHtml += u'<td>%s</td>'    % (webutils.escapeElem(oTestBox.getArchBitString()),);
         sHtml += u'<td>%s</td>'    % (webutils.escapeElem(oTestBox.getPrettyCpuVendor()),);
-        sHtml += u'<td>f=%#x, m=%#x, s=%#x' % (oTestBox.getCpuFamily(), oTestBox.getCpuModel(), oTestBox.getCpuStepping(),)
+        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(),)
         if oTestBox.fCpuNestedPaging:   sHtml += u', np';
         elif oTestBox.fCpuHwVirt:       sHtml += u', hw';