lkml.org 
[lkml]   [2007]   [Dec]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 49/52] KVM: MMU: Merge set_pte() and set_pte_common()
    Date
    Since set_pte() is now the only caller of set_pte_common(), merge the two
    functions.

    Signed-off-by: Avi Kivity <avi@qumranet.com>
    ---
    drivers/kvm/paging_tmpl.h | 26 ++++++--------------------
    1 files changed, 6 insertions(+), 20 deletions(-)

    diff --git a/drivers/kvm/paging_tmpl.h b/drivers/kvm/paging_tmpl.h
    index 062f4f5..54a6ee8 100644
    --- a/drivers/kvm/paging_tmpl.h
    +++ b/drivers/kvm/paging_tmpl.h
    @@ -186,15 +186,11 @@ err:
    return 0;
    }

    -static void FNAME(set_pte_common)(struct kvm_vcpu *vcpu,
    - u64 *shadow_pte,
    - pt_element_t gpte,
    - u64 access_bits,
    - int user_fault,
    - int write_fault,
    - int *ptwrite,
    - struct guest_walker *walker,
    - gfn_t gfn)
    +static void FNAME(set_pte)(struct kvm_vcpu *vcpu, pt_element_t gpte,
    + u64 *shadow_pte, u64 access_bits,
    + int user_fault, int write_fault,
    + int *ptwrite, struct guest_walker *walker,
    + gfn_t gfn)
    {
    int dirty = gpte & PT_DIRTY_MASK;
    u64 spte;
    @@ -206,6 +202,7 @@ static void FNAME(set_pte_common)(struct kvm_vcpu *vcpu,
    __FUNCTION__, *shadow_pte, (u64)gpte, access_bits,
    write_fault, user_fault, gfn);

    + access_bits &= gpte;
    /*
    * We don't set the accessed bit, since we sometimes want to see
    * whether the guest actually used the pte (in order to detect
    @@ -275,17 +272,6 @@ unshadowed:
    vcpu->last_pte_updated = shadow_pte;
    }

    -static void FNAME(set_pte)(struct kvm_vcpu *vcpu, pt_element_t gpte,
    - u64 *shadow_pte, u64 access_bits,
    - int user_fault, int write_fault, int *ptwrite,
    - struct guest_walker *walker, gfn_t gfn)
    -{
    - access_bits &= gpte;
    - FNAME(set_pte_common)(vcpu, shadow_pte,
    - gpte, access_bits, user_fault, write_fault,
    - ptwrite, walker, gfn);
    -}
    -
    static void FNAME(update_pte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *page,
    u64 *spte, const void *pte, int bytes,
    int offset_in_pte)
    --
    1.5.3.7


    \
     
     \ /
      Last update: 2007-12-30 08:27    [W:0.022 / U:93.904 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site