diff options
author | Xiantao Zhang <xiantao.zhang@intel.com> | 2008-10-07 20:29:33 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2008-10-15 08:25:39 -0400 |
commit | 2381ad241d0bea1253a37f314b270848067640bb (patch) | |
tree | f722e3da63c8f26ef7309653848ab7cea02e08cb /arch/ia64/kvm/kvm-ia64.c | |
parent | b010eb5103cfbe12ae6f08a4cdb3a748bf78c410 (diff) |
KVM: ia64: Add intel iommu support for guests.
With intel iommu hardware, we can assign devices to kvm/ia64 guests.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch/ia64/kvm/kvm-ia64.c')
-rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 3df82f3fe547..c0699f0e35a9 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/bitops.h> | 31 | #include <linux/bitops.h> |
32 | #include <linux/hrtimer.h> | 32 | #include <linux/hrtimer.h> |
33 | #include <linux/uaccess.h> | 33 | #include <linux/uaccess.h> |
34 | #include <linux/intel-iommu.h> | ||
34 | 35 | ||
35 | #include <asm/pgtable.h> | 36 | #include <asm/pgtable.h> |
36 | #include <asm/gcc_intrin.h> | 37 | #include <asm/gcc_intrin.h> |
@@ -187,6 +188,9 @@ int kvm_dev_ioctl_check_extension(long ext) | |||
187 | case KVM_CAP_COALESCED_MMIO: | 188 | case KVM_CAP_COALESCED_MMIO: |
188 | r = KVM_COALESCED_MMIO_PAGE_OFFSET; | 189 | r = KVM_COALESCED_MMIO_PAGE_OFFSET; |
189 | break; | 190 | break; |
191 | case KVM_CAP_IOMMU: | ||
192 | r = intel_iommu_found(); | ||
193 | break; | ||
190 | default: | 194 | default: |
191 | r = 0; | 195 | r = 0; |
192 | } | 196 | } |
@@ -773,6 +777,7 @@ static void kvm_init_vm(struct kvm *kvm) | |||
773 | */ | 777 | */ |
774 | kvm_build_io_pmt(kvm); | 778 | kvm_build_io_pmt(kvm); |
775 | 779 | ||
780 | INIT_LIST_HEAD(&kvm->arch.assigned_dev_head); | ||
776 | } | 781 | } |
777 | 782 | ||
778 | struct kvm *kvm_arch_create_vm(void) | 783 | struct kvm *kvm_arch_create_vm(void) |
@@ -1336,6 +1341,10 @@ static void kvm_release_vm_pages(struct kvm *kvm) | |||
1336 | 1341 | ||
1337 | void kvm_arch_destroy_vm(struct kvm *kvm) | 1342 | void kvm_arch_destroy_vm(struct kvm *kvm) |
1338 | { | 1343 | { |
1344 | kvm_iommu_unmap_guest(kvm); | ||
1345 | #ifdef KVM_CAP_DEVICE_ASSIGNMENT | ||
1346 | kvm_free_all_assigned_devices(kvm); | ||
1347 | #endif | ||
1339 | kfree(kvm->arch.vioapic); | 1348 | kfree(kvm->arch.vioapic); |
1340 | kvm_release_vm_pages(kvm); | 1349 | kvm_release_vm_pages(kvm); |
1341 | kvm_free_physmem(kvm); | 1350 | kvm_free_physmem(kvm); |