From: Roger Pau Monné <roger.pau@citrix.com>
Date: Fri, 27 Sep 2019 12:07:01 +0000 (+0200)
Subject: x86/iommu: improve logging message
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~1424
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0aeacaa0c95beddbc054ef5a70845e3e4cf4f385;p=xen.git

x86/iommu: improve logging message

Switch to using pd and also print the pfn that failed.

No functional change intended.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Release-acked-by: Juergen Gross <jgross@suse.com>
---

diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c
index 47a3e55213..7107b11757 100644
--- a/xen/drivers/passthrough/x86/iommu.c
+++ b/xen/drivers/passthrough/x86/iommu.c
@@ -200,8 +200,8 @@ void __hwdom_init arch_iommu_hwdom_init(struct domain *d)
                            IOMMUF_readable | IOMMUF_writable, &flush_flags);
 
         if ( rc )
-            printk(XENLOG_WARNING " d%d: IOMMU mapping failed: %d\n",
-                   d->domain_id, rc);
+            printk(XENLOG_WARNING "%pd: identity %smapping of %lx failed: %d\n",
+                   d, !paging_mode_translate(d) ? "IOMMU " : "", pfn, rc);
 
         if (!(i & 0xfffff))
             process_pending_softirqs();