lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: Portability: Move unalias_gfn to arch dependent file

Browse Source 
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>
This commit is contained in:
Zhang Xiantao
2007-11-22 11:20:33 +08:00
committed by Avi Kivity
parent 83ff3b9d4a
commit e9f85cde99
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/kvm/kvm_main.c
View File

@@ -408,20 +408,6 @@ int kvm_is_error_hva(unsigned long addr)
} }
EXPORT_SYMBOL_GPL(kvm_is_error_hva); 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) static struct kvm_memory_slot *__gfn_to_memslot(struct kvm *kvm, gfn_t gfn)
{ {
int i; int i;

14
drivers/kvm/x86.c
View File

@@ -1119,6 +1119,20 @@ static int kvm_vm_ioctl_get_nr_mmu_pages(struct kvm *kvm)
return kvm->n_alloc_mmu_pages; 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 * 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 * another portion. This is useful for memory windows, for example the PC