lkml.org 
[lkml]   [2008]   [Jan]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/54] KVM: Portability: Move unalias_gfn to arch dependent file
    Date
    From: Zhang Xiantao <xiantao.zhang@intel.com>

    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>
    ---
    drivers/kvm/kvm_main.c | 14 --------------
    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 a9e1c77..003a43c 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 7237cb2..2be5936 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
    --
    1.5.3.7


    \
     
     \ /
      Last update: 2008-01-01 16:41    [W:0.023 / U:0.616 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site