# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1259743919 0
# Node ID c1ae1009667f0834ceaf9bd79f8df0ad850e2eea
# Parent 4ed3b9b1de3f95d8a723fc7eb01ef798c4a69c42
pci: Correct BDF format from B:D:F to B:D.F in log messages.
Signed-off-by: Weidong Han <weidong.han@xxxxxxxxx>
---
xen/arch/ia64/xen/dom0_ops.c | 8 ++++----
xen/arch/x86/domctl.c | 6 +++---
xen/drivers/passthrough/vtd/iommu.c | 2 +-
xen/drivers/passthrough/vtd/utils.c | 2 +-
xen/drivers/passthrough/vtd/x86/ats.c | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff -r 4ed3b9b1de3f -r c1ae1009667f xen/arch/ia64/xen/dom0_ops.c
--- a/xen/arch/ia64/xen/dom0_ops.c Wed Dec 02 08:51:12 2009 +0000
+++ b/xen/arch/ia64/xen/dom0_ops.c Wed Dec 02 08:51:59 2009 +0000
@@ -312,7 +312,7 @@ long arch_do_domctl(xen_domctl_t *op, XE
if ( device_assigned(bus, devfn) )
{
printk( "XEN_DOMCTL_test_assign_device: "
- "%x:%x:%x already assigned, or non-existent\n",
+ "%x:%x.%x already assigned, or non-existent\n",
bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
break;
}
@@ -348,13 +348,13 @@ long arch_do_domctl(xen_domctl_t *op, XE
if ( device_assigned(bus, devfn) )
{
gdprintk(XENLOG_ERR, "XEN_DOMCTL_assign_device: "
- "%x:%x:%x already assigned, or non-existent\n",
+ "%x:%x.%x already assigned, or non-existent\n",
bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
break;
}
ret = assign_device(d, bus, devfn);
- gdprintk(XENLOG_INFO, "XEN_DOMCTL_assign_device: bdf = %x:%x:%x\n",
+ gdprintk(XENLOG_INFO, "XEN_DOMCTL_assign_device: bdf = %x:%x.%x\n",
bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
put_domain(d);
}
@@ -390,7 +390,7 @@ long arch_do_domctl(xen_domctl_t *op, XE
ret = 0;
deassign_device(d, bus, devfn);
- gdprintk(XENLOG_INFO, "XEN_DOMCTL_deassign_device: bdf = %x:%x:%x\n",
+ gdprintk(XENLOG_INFO, "XEN_DOMCTL_deassign_device: bdf = %x:%x.%x\n",
bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
put_domain(d);
}
diff -r 4ed3b9b1de3f -r c1ae1009667f xen/arch/x86/domctl.c
--- a/xen/arch/x86/domctl.c Wed Dec 02 08:51:12 2009 +0000
+++ b/xen/arch/x86/domctl.c Wed Dec 02 08:51:59 2009 +0000
@@ -688,7 +688,7 @@ long arch_do_domctl(
if ( device_assigned(bus, devfn) )
{
gdprintk(XENLOG_ERR, "XEN_DOMCTL_test_assign_device: "
- "%x:%x:%x already assigned, or non-existent\n",
+ "%x:%x.%x already assigned, or non-existent\n",
bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
break;
}
@@ -732,7 +732,7 @@ long arch_do_domctl(
ret = assign_device(d, bus, devfn);
if ( ret )
gdprintk(XENLOG_ERR, "XEN_DOMCTL_assign_device: "
- "assign device (%x:%x:%x) failed\n",
+ "assign device (%x:%x.%x) failed\n",
bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
assign_device_out:
@@ -774,7 +774,7 @@ long arch_do_domctl(
spin_lock(&pcidevs_lock);
ret = deassign_device(d, bus, devfn);
spin_unlock(&pcidevs_lock);
- gdprintk(XENLOG_INFO, "XEN_DOMCTL_deassign_device: bdf = %x:%x:%x\n",
+ gdprintk(XENLOG_INFO, "XEN_DOMCTL_deassign_device: bdf = %x:%x.%x\n",
bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
deassign_device_out:
diff -r 4ed3b9b1de3f -r c1ae1009667f xen/drivers/passthrough/vtd/iommu.c
--- a/xen/drivers/passthrough/vtd/iommu.c Wed Dec 02 08:51:12 2009 +0000
+++ b/xen/drivers/passthrough/vtd/iommu.c Wed Dec 02 08:51:59 2009 +0000
@@ -1383,7 +1383,7 @@ static int domain_context_unmap(struct d
default:
gdprintk(XENLOG_ERR VTDPREFIX,
- "domain_context_unmap:unknown type: bdf = %x:%x:%x\n",
+ "domain_context_unmap:unknown type: bdf = %x:%x.%x\n",
bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
ret = -EINVAL;
break;
diff -r 4ed3b9b1de3f -r c1ae1009667f xen/drivers/passthrough/vtd/utils.c
--- a/xen/drivers/passthrough/vtd/utils.c Wed Dec 02 08:51:12 2009 +0000
+++ b/xen/drivers/passthrough/vtd/utils.c Wed Dec 02 08:51:59 2009 +0000
@@ -116,7 +116,7 @@ void print_vtd_entries(struct iommu *iom
u64 *l;
u32 l_index, level;
- printk("print_vtd_entries: iommu = %p bdf = %x:%x:%x gmfn = %"PRIx64"\n",
+ printk("print_vtd_entries: iommu = %p bdf = %x:%x.%x gmfn = %"PRIx64"\n",
iommu, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), gmfn);
if ( iommu->root_maddr == 0 )
diff -r 4ed3b9b1de3f -r c1ae1009667f xen/drivers/passthrough/vtd/x86/ats.c
--- a/xen/drivers/passthrough/vtd/x86/ats.c Wed Dec 02 08:51:12 2009 +0000
+++ b/xen/drivers/passthrough/vtd/x86/ats.c Wed Dec 02 08:51:59 2009 +0000
@@ -124,12 +124,12 @@ int enable_ats_device(int seg, int bus,
pos = pci_find_ext_capability(seg, bus, devfn, PCI_EXT_CAP_ID_ATS);
if ( !pos )
{
- dprintk(XENLOG_ERR VTDPREFIX, "ats capability not found %x:%x:%x\n",
+ dprintk(XENLOG_ERR VTDPREFIX, "ats capability not found %x:%x.%x\n",
bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
return 0;
}
else
- dprintk(XENLOG_ERR VTDPREFIX, "ats capability found %x:%x:%x\n",
+ dprintk(XENLOG_ERR VTDPREFIX, "ats capability found %x:%x.%x\n",
bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
/* BUGBUG: add back seg when multi-seg platform support is enabled */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home