diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2008-12-03 08:43:34 -0500 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-01-03 08:11:07 -0500 |
| commit | 19de40a8472fa64693eab844911eec277d489f6c (patch) | |
| tree | 502a8df560341ad715965ed39db33c720c657066 /include/linux | |
| parent | 1aaf118352b85bb359ce28070bcc478f659a7031 (diff) | |
KVM: change KVM to use IOMMU API
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kvm_host.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index e62a4629e51c..ec49d0be7f52 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h | |||
| @@ -328,7 +328,7 @@ void kvm_unregister_irq_ack_notifier(struct kvm_irq_ack_notifier *kian); | |||
| 328 | int kvm_request_irq_source_id(struct kvm *kvm); | 328 | int kvm_request_irq_source_id(struct kvm *kvm); |
| 329 | void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id); | 329 | void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id); |
| 330 | 330 | ||
| 331 | #ifdef CONFIG_DMAR | 331 | #ifdef CONFIG_IOMMU_API |
| 332 | int kvm_iommu_map_pages(struct kvm *kvm, gfn_t base_gfn, | 332 | int kvm_iommu_map_pages(struct kvm *kvm, gfn_t base_gfn, |
| 333 | unsigned long npages); | 333 | unsigned long npages); |
| 334 | int kvm_iommu_map_guest(struct kvm *kvm); | 334 | int kvm_iommu_map_guest(struct kvm *kvm); |
| @@ -337,7 +337,7 @@ int kvm_assign_device(struct kvm *kvm, | |||
| 337 | struct kvm_assigned_dev_kernel *assigned_dev); | 337 | struct kvm_assigned_dev_kernel *assigned_dev); |
| 338 | int kvm_deassign_device(struct kvm *kvm, | 338 | int kvm_deassign_device(struct kvm *kvm, |
| 339 | struct kvm_assigned_dev_kernel *assigned_dev); | 339 | struct kvm_assigned_dev_kernel *assigned_dev); |
| 340 | #else /* CONFIG_DMAR */ | 340 | #else /* CONFIG_IOMMU_API */ |
| 341 | static inline int kvm_iommu_map_pages(struct kvm *kvm, | 341 | static inline int kvm_iommu_map_pages(struct kvm *kvm, |
| 342 | gfn_t base_gfn, | 342 | gfn_t base_gfn, |
| 343 | unsigned long npages) | 343 | unsigned long npages) |
| @@ -366,7 +366,7 @@ static inline int kvm_deassign_device(struct kvm *kvm, | |||
| 366 | { | 366 | { |
| 367 | return 0; | 367 | return 0; |
| 368 | } | 368 | } |
| 369 | #endif /* CONFIG_DMAR */ | 369 | #endif /* CONFIG_IOMMU_API */ |
| 370 | 370 | ||
| 371 | static inline void kvm_guest_enter(void) | 371 | static inline void kvm_guest_enter(void) |
| 372 | { | 372 | { |
