>From 4ea2d880c0250c1278995e5ee7d9e48151c4e4e1 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Tue, 4 Feb 2014 12:52:35 -0500 Subject: [PATCH 1/5] pci: On PCI dump device keyhandler include Device and Vendor ID As it helps in troubleshooting if the initial domain has re-numbered the bus numbers and what Xen sees is not the reality. Signed-off-by: Konrad Rzeszutek Wilk --- xen/drivers/passthrough/pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index cdbabc2..5e5097e 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -1211,9 +1211,12 @@ static int _dump_pci_devices(struct pci_seg *pseg, void *arg) list_for_each_entry ( pdev, &pseg->alldevs_list, alldevs_list ) { - printk("%04x:%02x:%02x.%u - dom %-3d - node %-3d - MSIs < ", + int id = pci_conf_read32(pseg->nr, pdev->bus, PCI_SLOT(pdev->devfn), + PCI_FUNC(pdev->devfn), 0); + printk("%04x:%02x:%02x.%u (%04x:%04x)- dom %-3d - node %-3d - MSIs < ", pseg->nr, pdev->bus, PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn), + id & 0xffff, (id >> 16) & 0xffff, pdev->domain ? pdev->domain->domain_id : -1, (pdev->node != NUMA_NO_NODE) ? pdev->node : -1); list_for_each_entry ( msi, &pdev->msi_list, list ) -- 2.5.5