From: Roger Pau Monné <roger.pau@citrix.com>
Date: Mon, 30 Sep 2019 13:46:57 +0000 (+0200)
Subject: x86/iommu: fix hwdom iommu requirements check
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~1385
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=574e45411f7151631da6aa24f30e4c3c80756803;p=xen.git

x86/iommu: fix hwdom iommu requirements check

Both a shadow and a HAP hwdom require an iommu and must be run in
strict mode. Change the HAP check into a hvm domain check.

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

diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c
index 8b550f909b..9ef5f376c5 100644
--- a/xen/drivers/passthrough/iommu.c
+++ b/xen/drivers/passthrough/iommu.c
@@ -154,7 +154,7 @@ custom_param("dom0-iommu", parse_dom0_iommu_param);
 
 static void __hwdom_init check_hwdom_reqs(struct domain *d)
 {
-    if ( iommu_hwdom_none || !hap_enabled(d) )
+    if ( iommu_hwdom_none || !is_hvm_domain(d) )
         return;
 
     iommu_hwdom_passthrough = false;