diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2011-09-06 12:46:34 -0400 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2011-10-21 08:37:20 -0400 |
commit | a1b60c1cd913c5ccfb38c717ba0bd22622425fa7 (patch) | |
tree | 74e5c1e847262ba3c42fb3b0396a3e781c168b6e /arch/x86/kvm | |
parent | 905d66c1e5dc8149e111f04a32bb193f25da1d53 (diff) |
iommu/core: Convert iommu_found to iommu_present
With per-bus iommu_ops the iommu_found function needs to
work on a bus_type too. This patch adds a bus_type parameter
to that function and converts all call-places.
The function is also renamed to iommu_present because the
function now checks if an iommu is present for a given bus
and does not check for a global iommu anymore.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r-- | arch/x86/kvm/x86.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 84a28ea45fa4..73c6a4268bf4 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -44,6 +44,7 @@ | |||
44 | #include <linux/perf_event.h> | 44 | #include <linux/perf_event.h> |
45 | #include <linux/uaccess.h> | 45 | #include <linux/uaccess.h> |
46 | #include <linux/hash.h> | 46 | #include <linux/hash.h> |
47 | #include <linux/pci.h> | ||
47 | #include <trace/events/kvm.h> | 48 | #include <trace/events/kvm.h> |
48 | 49 | ||
49 | #define CREATE_TRACE_POINTS | 50 | #define CREATE_TRACE_POINTS |
@@ -2095,7 +2096,7 @@ int kvm_dev_ioctl_check_extension(long ext) | |||
2095 | r = 0; | 2096 | r = 0; |
2096 | break; | 2097 | break; |
2097 | case KVM_CAP_IOMMU: | 2098 | case KVM_CAP_IOMMU: |
2098 | r = iommu_found(); | 2099 | r = iommu_present(&pci_bus_type); |
2099 | break; | 2100 | break; |
2100 | case KVM_CAP_MCE: | 2101 | case KVM_CAP_MCE: |
2101 | r = KVM_MAX_MCE_BANKS; | 2102 | r = KVM_MAX_MCE_BANKS; |