Ian Campbell
2011-Mar-08 11:15 UTC
[Xen-devel] [PATCH] xl/xm: make pci-list use same BDF format as all other commands
# HG changeset patch # User Ian Campbell <ian.campbell@citrix.com> # Date 1299582792 0 # Node ID 0e3211b5c4da98d170ed665c221bcb00e771fc56 # Parent e5272ebca6a039164729aeba0dbccc13974851c4 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. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> diff -r e5272ebca6a0 -r 0e3211b5c4da tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Mon Mar 07 09:01:56 2011 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Mar 08 11:13:12 2011 +0000 @@ -2080,9 +2080,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 -r e5272ebca6a0 -r 0e3211b5c4da tools/python/xen/xm/main.py --- a/tools/python/xen/xm/main.py Mon Mar 07 09:01:56 2011 +0000 +++ b/tools/python/xen/xm/main.py Tue Mar 08 11:13:12 2011 +0000 @@ -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''] = ''-'' - else: - x[''show_vslot''] = "0x%02x" % PCI_SLOT(x[''vdevfn'']) - x[''show_vfunc''] = "0x%x" % PCI_FUNC(x[''vdevfn'']) + x[''show_vdevfn''] = ''-'' + else: + 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: _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Jackson
2011-Mar-09 17:07 UTC
Re: [Xen-devel] [PATCH] xl/xm: make pci-list use same BDF format as all other commands
Ian Campbell writes ("[Xen-devel] [PATCH] xl/xm: make pci-list use same BDF format as all other commands"):> xl/xm: make pci-list use same BDF format as all other commandsThanks, following discussions, I have acked this this and applied it to xen-unstable and 4.1. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel