lkml.org 
[lkml]   [2009]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 37/40] KVM: ppc: cosmetic changes to mmu hook names
    Date
    From: Hollis Blanchard <hollisb@us.ibm.com>

    Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
    ---
    arch/powerpc/include/asm/kvm_ppc.h | 5 +++--
    arch/powerpc/kvm/44x_tlb.c | 2 +-
    arch/powerpc/kvm/powerpc.c | 2 +-
    3 files changed, 5 insertions(+), 4 deletions(-)

    diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h
    index 36d2a50..7ba95d2 100644
    --- a/arch/powerpc/include/asm/kvm_ppc.h
    +++ b/arch/powerpc/include/asm/kvm_ppc.h
    @@ -52,13 +52,14 @@ extern int kvmppc_emulate_instruction(struct kvm_run *run,
    extern int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu);
    extern void kvmppc_emulate_dec(struct kvm_vcpu *vcpu);

    +/* Core-specific hooks */
    +
    extern void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gpa_t gpaddr,
    u64 asid, u32 flags, u32 max_bytes,
    unsigned int gtlb_idx);
    extern void kvmppc_mmu_priv_switch(struct kvm_vcpu *vcpu, int usermode);
    extern void kvmppc_mmu_switch_pid(struct kvm_vcpu *vcpu, u32 pid);
    -
    -/* Core-specific hooks */
    +extern void kvmppc_mmu_destroy(struct kvm_vcpu *vcpu);

    extern struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm,
    unsigned int id);
    diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c
    index 9a34b8e..8f9c09c 100644
    --- a/arch/powerpc/kvm/44x_tlb.c
    +++ b/arch/powerpc/kvm/44x_tlb.c
    @@ -248,7 +248,7 @@ static void kvmppc_44x_shadow_release(struct kvmppc_vcpu_44x *vcpu_44x,
    KVMTRACE_1D(STLB_INVAL, &vcpu_44x->vcpu, stlb_index, handler);
    }

    -void kvmppc_core_destroy_mmu(struct kvm_vcpu *vcpu)
    +void kvmppc_mmu_destroy(struct kvm_vcpu *vcpu)
    {
    struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);
    int i;
    diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
    index 7c2ad40..f30be9e 100644
    --- a/arch/powerpc/kvm/powerpc.c
    +++ b/arch/powerpc/kvm/powerpc.c
    @@ -216,7 +216,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)

    void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)
    {
    - kvmppc_core_destroy_mmu(vcpu);
    + kvmppc_mmu_destroy(vcpu);
    }

    void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
    --
    1.6.0.6


    \
     
     \ /
      Last update: 2009-02-26 15:29    [W:0.027 / U:60.268 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site