xen/pciback: Include the domain id if removing the device whilst still in use

Cleanup the function a bit - also include the id of the
domain that is using the device.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>

diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c
index 8b77089..e5ff09d 100644 (file)
--- a/drivers/xen/xen-pciback/pci_stub.c
+++ b/drivers/xen/xen-pciback/pci_stub.c
@@ -553,12 +553,14 @@ static void pcistub_remove(struct pci_dev *dev)
        spin_unlock_irqrestore(&pcistub_devices_lock, flags);
 
        if (found_psdev) {
-               dev_dbg(&dev->dev, "found device to remove - in use? %p\n",
-                       found_psdev->pdev);
+               dev_dbg(&dev->dev, "found device to remove %s\n",
+                       found_psdev->pdev ? "- in-use" : "");
 
                if (found_psdev->pdev) {
-                       pr_warn("****** removing device %s while still in-use! ******\n",
-                              pci_name(found_psdev->dev));
+                       int domid = xen_find_device_domain_owner(dev);
+
+                       pr_warn("****** removing device %s while still in-use by domain %d! ******\n",
+                              pci_name(found_psdev->dev), domid);
                        pr_warn("****** driver domain may still access this device's i/o resources!\n");
                        pr_warn("****** shutdown driver domain before binding device\n");
                        pr_warn("****** to other drivers or domains\n");