aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@redhat.com>2013-04-29 12:54:08 -0400
committerMarcelo Tosatti <mtosatti@redhat.com>2013-04-29 22:08:50 -0400
commit4cee4b72f1e2600e19779a14d4d9a4f4016ce49f (patch)
tree92663df9a836d5caa8281e21a888f27771eb1c9c
parent5a2892ce72e010e3cb96b438d7cdddce0c88e0e6 (diff)
kvm: KVM_CAP_IOMMU only available with device assignment
Fix build with CONFIG_PCI unset by linking KVM_CAP_IOMMU to device assignment config option. It has no purpose otherwise. Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Reported-by: Randy Dunlap <rdunlap@infradead.org> Acked-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--arch/ia64/kvm/kvm-ia64.c2
-rw-r--r--arch/x86/kvm/x86.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index dcc560729c20..5b2dc0d10c8f 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -204,9 +204,11 @@ int kvm_dev_ioctl_check_extension(long ext)
204 case KVM_CAP_COALESCED_MMIO: 204 case KVM_CAP_COALESCED_MMIO:
205 r = KVM_COALESCED_MMIO_PAGE_OFFSET; 205 r = KVM_COALESCED_MMIO_PAGE_OFFSET;
206 break; 206 break;
207#ifdef CONFIG_KVM_DEVICE_ASSIGNMENT
207 case KVM_CAP_IOMMU: 208 case KVM_CAP_IOMMU:
208 r = iommu_present(&pci_bus_type); 209 r = iommu_present(&pci_bus_type);
209 break; 210 break;
211#endif
210 default: 212 default:
211 r = 0; 213 r = 0;
212 } 214 }
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 8747fef7fd59..96f914e828d4 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2544,9 +2544,11 @@ int kvm_dev_ioctl_check_extension(long ext)
2544 case KVM_CAP_PV_MMU: /* obsolete */ 2544 case KVM_CAP_PV_MMU: /* obsolete */
2545 r = 0; 2545 r = 0;
2546 break; 2546 break;
2547#ifdef CONFIG_KVM_DEVICE_ASSIGNMENT
2547 case KVM_CAP_IOMMU: 2548 case KVM_CAP_IOMMU:
2548 r = iommu_present(&pci_bus_type); 2549 r = iommu_present(&pci_bus_type);
2549 break; 2550 break;
2551#endif
2550 case KVM_CAP_MCE: 2552 case KVM_CAP_MCE:
2551 r = KVM_MAX_MCE_BANKS; 2553 r = KVM_MAX_MCE_BANKS;
2552 break; 2554 break;