All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit e7b54363 authored by Ian Campbell's avatar Ian Campbell

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: default avatarIan Campbell <ian.campbell@citrix.com>
Committed-by: default avatarIan Jackson <ian.jackson@eu.citrix.com>
parent c73ce19f
......@@ -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);
......
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment