From: Jan Beulich Date: Tue, 10 Nov 2020 13:39:30 +0000 (+0100) Subject: x86/CPUID: suppress IOMMU related hypervisor leaf data X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~1418 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f5cfa09856732b1d78ff6a21ca3dc33a010da951;p=xen.git x86/CPUID: suppress IOMMU related hypervisor leaf data Now that the IOMMU for guests can't be enabled "on demand" anymore, there's also no reason to expose the related CPUID bit "just in case". Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index bc5b8f8ea3..c27dd4cd43 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1050,7 +1050,8 @@ void cpuid_hypervisor_leaves(const struct vcpu *v, uint32_t leaf, * Indicate that memory mapped from other domains (either grants or * foreign pages) has valid IOMMU entries. */ - res->a |= XEN_HVM_CPUID_IOMMU_MAPPINGS; + if ( is_iommu_enabled(d) ) + res->a |= XEN_HVM_CPUID_IOMMU_MAPPINGS; /* Indicate presence of vcpu id and set it in ebx */ res->a |= XEN_HVM_CPUID_VCPU_ID_PRESENT;