diff options
| author |   Zhang Xiantao <xiantao.zhang@intel.com> | 2007-11-22 11:20:33 +0800 |
|---|---|---|
| committer |   Avi Kivity <avi@qumranet.com> | 2008-01-30 17:53:14 +0200 |
| commit | e9f85cde99fa011db256f6683ba81d155e0d3f57 (patch) | |
| tree | 778409f784f030687166c660c2dd9425d032ec1f | |
| parent | KVM: VMX: Remove the secondary execute control dependency on irqchip (diff) | |
| download | linux-dev-e9f85cde99fa011db256f6683ba81d155e0d3f57.tar.xz linux-dev-e9f85cde99fa011db256f6683ba81d155e0d3f57.zip | |
KVM: Portability: Move unalias_gfn to arch dependent file
Non-x86 archs don't need this mechanism. Move it to arch, and
keep its interface in common.
Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com>
Acked-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
| -rw-r--r-- | drivers/kvm/kvm_main.c | 14 | ||||
| -rw-r--r-- | drivers/kvm/x86.c | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index 0efd759e585f..721e660023f6 100644 --- a/drivers/kvm/kvm_main.c +++ b/drivers/kvm/kvm_main.c @@ -408,20 +408,6 @@ int kvm_is_error_hva(unsigned long addr) } EXPORT_SYMBOL_GPL(kvm_is_error_hva); -gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn) -{ - int i; - struct kvm_mem_alias *alias; - - for (i = 0; i < kvm->naliases; ++i) { - alias = &kvm->aliases[i]; - if (gfn >= alias->base_gfn - && gfn < alias->base_gfn + alias->npages) - return alias->target_gfn + gfn - alias->base_gfn; - } - return gfn; -} - static struct kvm_memory_slot *__gfn_to_memslot(struct kvm *kvm, gfn_t gfn) { int i; diff --git a/drivers/kvm/x86.c b/drivers/kvm/x86.c index 7237cb25f77d..2be59364a49d 100644 --- a/drivers/kvm/x86.c +++ b/drivers/kvm/x86.c @@ -1119,6 +1119,20 @@ static int kvm_vm_ioctl_get_nr_mmu_pages(struct kvm *kvm) return kvm->n_alloc_mmu_pages; } +gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn) +{ + int i; + struct kvm_mem_alias *alias; + + for (i = 0; i < kvm->naliases; ++i) { + alias = &kvm->aliases[i]; + if (gfn >= alias->base_gfn + && gfn < alias->base_gfn + alias->npages) + return alias->target_gfn + gfn - alias->base_gfn; + } + return gfn; +} + /* * Set a new alias region. Aliases map a portion of physical memory into * another portion. This is useful for memory windows, for example the PC |