From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 2 Dec 2009 08:51:59 +0000 (+0000)
Subject: pci: Correct BDF format from B:D:F to B:D.F in log messages.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12983
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c1e6d23db0b73b98538c5388095162d48229a680;p=xen.git

pci: Correct BDF format from B:D:F to B:D.F in log messages.

Signed-off-by: Weidong Han <weidong.han@intel.com>
---

diff --git a/xen/arch/ia64/xen/dom0_ops.c b/xen/arch/ia64/xen/dom0_ops.c
index 26cd19a96f..d5a971e84b 100644
--- a/xen/arch/ia64/xen/dom0_ops.c
+++ b/xen/arch/ia64/xen/dom0_ops.c
@@ -312,7 +312,7 @@ long arch_do_domctl(xen_domctl_t *op, XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
         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, XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
         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, XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
 
         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 --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index 4b0011a52c..ece40141bf 100644
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -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 --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c
index 4cd07090a8..4343410d18 100644
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -1383,7 +1383,7 @@ static int domain_context_unmap(struct domain *domain, u8 bus, u8 devfn)
 
     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 --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/vtd/utils.c
index cfcbed1f01..4053f883ca 100644
--- a/xen/drivers/passthrough/vtd/utils.c
+++ b/xen/drivers/passthrough/vtd/utils.c
@@ -116,7 +116,7 @@ void print_vtd_entries(struct iommu *iommu, int bus, int devfn, u64 gmfn)
     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 --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthrough/vtd/x86/ats.c
index 308a66640d..d16e55bda2 100644
--- a/xen/drivers/passthrough/vtd/x86/ats.c
+++ b/xen/drivers/passthrough/vtd/x86/ats.c
@@ -124,12 +124,12 @@ int enable_ats_device(int seg, int bus, int devfn)
     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 */