diff options
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/iommu.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/virt/kvm/iommu.c b/virt/kvm/iommu.c index 714b94932312..45ee080573f4 100644 --- a/virt/kvm/iommu.c +++ b/virt/kvm/iommu.c | |||
| @@ -191,8 +191,7 @@ int kvm_assign_device(struct kvm *kvm, | |||
| 191 | return r; | 191 | return r; |
| 192 | } | 192 | } |
| 193 | 193 | ||
| 194 | noncoherent = !iommu_domain_has_cap(kvm->arch.iommu_domain, | 194 | noncoherent = !iommu_capable(&pci_bus_type, IOMMU_CAP_CACHE_COHERENCY); |
| 195 | IOMMU_CAP_CACHE_COHERENCY); | ||
| 196 | 195 | ||
| 197 | /* Check if need to update IOMMU page table for guest memory */ | 196 | /* Check if need to update IOMMU page table for guest memory */ |
| 198 | if (noncoherent != kvm->arch.iommu_noncoherent) { | 197 | if (noncoherent != kvm->arch.iommu_noncoherent) { |
| @@ -254,8 +253,7 @@ int kvm_iommu_map_guest(struct kvm *kvm) | |||
| 254 | } | 253 | } |
| 255 | 254 | ||
| 256 | if (!allow_unsafe_assigned_interrupts && | 255 | if (!allow_unsafe_assigned_interrupts && |
| 257 | !iommu_domain_has_cap(kvm->arch.iommu_domain, | 256 | !iommu_capable(&pci_bus_type, IOMMU_CAP_INTR_REMAP)) { |
| 258 | IOMMU_CAP_INTR_REMAP)) { | ||
| 259 | printk(KERN_WARNING "%s: No interrupt remapping support," | 257 | printk(KERN_WARNING "%s: No interrupt remapping support," |
| 260 | " disallowing device assignment." | 258 | " disallowing device assignment." |
| 261 | " Re-enble with \"allow_unsafe_assigned_interrupts=1\"" | 259 | " Re-enble with \"allow_unsafe_assigned_interrupts=1\"" |
