HVM-349 Remove ifdef's around IOMMU

HVM-350 Remove CONFIG_DMAR related pieces

3 files changed, 0 insertions, 22 deletions

diff --git a/kvm.c b/kvm.c
index 9090c48..1704454 100644
--- a/kvm.c
+++ b/kvm.c
@@ -693,15 +693,6 @@ skip_lpage:
 	if (r)
 		goto out_free;
 
-#ifdef CONFIG_DMAR
-	/* map the pages in iommu page table */
-	if (npages) {
-		r = kvm_iommu_map_pages(kvmp, &new);
-		if (r)
-			goto out_free;
-	}
-#endif
-
 	r = ENOMEM;
 	slots = kmem_zalloc(sizeof (kvm_memslots_t), KM_SLEEP);
 	memcpy(slots, kvmp->memslots, sizeof (kvm_memslots_t));
diff --git a/kvm_host.h b/kvm_host.h
index 0b88500..8835b06 100644
--- a/kvm_host.h
+++ b/kvm_host.h
@@ -476,14 +476,6 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id);
 /* For vcpu->arch.iommu_flags */
 #define KVM_IOMMU_CACHE_COHERENCY	0x1
 
-int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot);
-int kvm_iommu_map_guest(struct kvm *kvm);
-int kvm_iommu_unmap_guest(struct kvm *kvm);
-int kvm_assign_device(struct kvm *kvm,
-		      struct kvm_assigned_dev_kernel *assigned_dev);
-int kvm_deassign_device(struct kvm *kvm,
-			struct kvm_assigned_dev_kernel *assigned_dev);
-
 void kvm_guest_enter(void);
 void kvm_guest_exit(void);
 void kvm_migrate_timers(struct kvm_vcpu *vcpu);
diff --git a/kvm_x86.c b/kvm_x86.c
index 81ae577..a033025 100644
--- a/kvm_x86.c
+++ b/kvm_x86.c
@@ -4970,11 +4970,6 @@ kvm_arch_destroy_vm_comps(struct kvm *kvmp)
 {
 	if (kvmp == NULL)
 
-#ifdef IOMMU
-	kvm_iommu_unmap_guest(kvmp);
-#else
-	XXX_KVM_PROBE;
-#endif /* IOMMU */
 	kvm_free_pit(kvmp);
 	kvm_free_vcpus(kvmp);
 	kvm_free_physmem(kvmp);