xl/xm: make pci-list use same BDF format as all other commands

In particular using the same syntax as pci-{attach,detach} uses is
very helpful.

(Backport from xen-unstable as 23015:1df8f9732d1d.)

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index de7230dd53d933257efcc6c2a678a4007f4865c0..121a58615f0b583a22d2c4f0397ce4f10fc2b214 100644 (file)
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -2077,9 +2077,11 @@ static void pcilist(const char *dom)
 
     if (libxl_device_pci_list_assigned(&ctx, &pcidevs, domid, &num))
         return;
-    printf("VFn  domain bus  slot func\n");
+    printf("Vdev Device\n");
     for (i = 0; i < num; i++) {
-        printf("0x%02x 0x%04x 0x%02x 0x%02x 0x%01x\n", pcidevs[i].vdevfn, pcidevs[i].domain, pcidevs[i].bus, pcidevs[i].dev, pcidevs[i].func);
+        printf("%02x.%01x %04x:%02x:%02x.%01x\n",
+               (pcidevs[i].vdevfn >> 3) & 0x1f, pcidevs[i].vdevfn & 0x7,
+               pcidevs[i].domain, pcidevs[i].bus, pcidevs[i].dev, pcidevs[i].func);
         libxl_device_pci_destroy(&pcidevs[i]);
     }
     free(pcidevs);

diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index 66e95ea92ce4b0c0f0c0d0c530129dff79d28a23..df861b13b45b8549cdb8b6cc8acdc237c174e9b8 100644 (file)
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -2483,18 +2483,16 @@ def xm_pci_list(args):
     has_vdevfn = False
     for x in devs:
         if x['vdevfn'] & AUTO_PHP_SLOT:
-            x['show_vslot'] = '-'
-            x['show_vfunc'] = '-'
+            x['show_vdevfn'] = '-'
         else:
-            x['show_vslot'] = "0x%02x" % PCI_SLOT(x['vdevfn'])
-            x['show_vfunc'] = "0x%x" % PCI_FUNC(x['vdevfn'])
+            x['show_vdevfn'] = "%02x.%01x" % (PCI_SLOT(x['vdevfn']), PCI_FUNC(x['vdevfn']))
             has_vdevfn = True
 
-    hdr_str = 'domain bus  slot func'
-    fmt_str = '0x%(domain)04x 0x%(bus)02x 0x%(slot)02x 0x%(func)x'
+    hdr_str = 'Device'
+    fmt_str = '%(domain)04x:%(bus)02x:%(slot)02x.%(func)x'
     if has_vdevfn:
-        hdr_str = 'VSlt VFn ' + hdr_str
-        fmt_str = '%(show_vslot)-4s %(show_vfunc)-3s ' + fmt_str
+        hdr_str = 'Vdev ' + hdr_str
+        fmt_str = '%(show_vdevfn)-4s ' + fmt_str
 
     print hdr_str
     for x in devs: