[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen-unstable] xm: Unify the output of pci-list



# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1243585651 -3600
# Node ID 02cee9e4363e1687c74cbc56125c458ed071bdd2
# Parent  ae5bd69227d14e27bdd6753b9d21504a0b0242be
xm: Unify the output of pci-list

This is another attempt at having pci-list produce consistent output.
Without this change there differences in the output of both vslots
and domain occur for domains that have never been started and domains
that have been started.

In order to address this I have taken the approach of
using integers where possible and explicitly formating them,
rather than relying on string representations that are present in
data structures.

I have also re-used the common part of the format, to try
and mitigate. the possibility of future inconsistencies there.

This patch also:
* Removes trailing whitespace
* Removes unnecessary brackets and whitespace from print invocations
* Prints the header outside of the loop to avoid having
  to maintain a state variable

Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
---
 tools/python/xen/xm/main.py |   46 ++++++++++++++++++++++----------------------
 1 files changed, 24 insertions(+), 22 deletions(-)

diff -r ae5bd69227d1 -r 02cee9e4363e tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py       Fri May 29 09:26:49 2009 +0100
+++ b/tools/python/xen/xm/main.py       Fri May 29 09:27:31 2009 +0100
@@ -2183,43 +2183,45 @@ def xm_pci_list(args):
             ppci_ref = server.xenapi.DPCI.get_PPCI(dpci_ref)
             ppci_record = server.xenapi.PPCI.get_record(ppci_ref)
             dev = {
-                "domain":   "0x%04x" % int(ppci_record["domain"]),
-                "bus":      "0x%02x" % int(ppci_record["bus"]),
-                "slot":     "0x%02x" % int(ppci_record["slot"]),
-                "func":     "0x%01x" % int(ppci_record["func"]),
-                "vslot":    "0x%02x" % \
-                            int(server.xenapi.DPCI.get_hotplug_slot(dpci_ref))
+                "domain":   int(ppci_record["domain"]),
+                "bus":      int(ppci_record["bus"]),
+                "slot":     int(ppci_record["slot"]),
+                "func":     int(ppci_record["func"]),
+                "vslot":    int(server.xenapi.DPCI.get_hotplug_slot(dpci_ref))
             }
             devs.append(dev)
 
     else:
-        devs = server.xend.domain.getDeviceSxprs(dom, 'pci')
+        for x in server.xend.domain.getDeviceSxprs(dom, 'pci'):
+            dev = {
+                "domain":   int(x["domain"], 16),
+                "bus":      int(x["bus"], 16),
+                "slot":     int(x["slot"], 16),
+                "func":     int(x["func"], 16),
+                "vslot":    int(assigned_or_requested_vslot(x), 16)
+            }
+            devs.append(dev)
 
     if len(devs) == 0:
         return
 
     has_vslot = False
     for x in devs:
-        vslot = assigned_or_requested_vslot(x)
-        if int(vslot, 16) == AUTO_PHP_SLOT:
-            x['vslot'] = '-'
+        if x['vslot'] == AUTO_PHP_SLOT:
+            x['show_vslot'] = '-'
         else:
-            x['vslot'] = vslot
+            x['show_vslot'] = "0x%02x" % x['vslot']
             has_vslot = True
 
+    hdr_str = 'domain bus  slot func'
+    fmt_str = '0x%(domain)04x 0x%(bus)02x 0x%(slot)02x 0x%(func)x'
     if has_vslot:
-        hdr_str = 'VSlt domain   bus   slot   func'
-        fmt_str =  "%(vslot)-4s %(domain)-6s   %(bus)-4s  %(slot)-4s   
%(func)-3s    "
-    else:
-        hdr_str = 'domain   bus   slot   func'
-        fmt_str =  "%(domain)-6s   %(bus)-4s  %(slot)-4s   %(func)-3s    "
-    hdr = 0
-
+        hdr_str = 'VSlt ' + hdr_str
+        fmt_str = '%(show_vslot)-4s ' + fmt_str
+
+    print hdr_str
     for x in devs:
-        if hdr == 0:
-            print (hdr_str)
-            hdr = 1
-        print ( fmt_str % x )
+        print fmt_str % x
 
 
 def parse_pci_info(info):

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.