lkml.org 
[lkml]   [2018]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/9] x86/kvm/mmu: get rid of redundant kvm_mmu_setup()
    Date
    From: Paolo Bonzini <pbonzini@redhat.com>

    Just inline the contents into the sole caller, kvm_init_mmu is now
    public.

    Suggested-by: Vitaly Kuznetsov <vkuznets@redhat.com>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    ---
    arch/x86/include/asm/kvm_host.h | 1 -
    arch/x86/kvm/mmu.c | 7 -------
    arch/x86/kvm/x86.c | 2 +-
    3 files changed, 1 insertion(+), 9 deletions(-)

    diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
    index 932c3285739f..c5f116f9783d 100644
    --- a/arch/x86/include/asm/kvm_host.h
    +++ b/arch/x86/include/asm/kvm_host.h
    @@ -1167,7 +1167,6 @@ void kvm_mmu_module_exit(void);

    void kvm_mmu_destroy(struct kvm_vcpu *vcpu);
    int kvm_mmu_create(struct kvm_vcpu *vcpu);
    -void kvm_mmu_setup(struct kvm_vcpu *vcpu);
    void kvm_mmu_init_vm(struct kvm *kvm);
    void kvm_mmu_uninit_vm(struct kvm *kvm);
    void kvm_mmu_set_mask_ptes(u64 user_mask, u64 accessed_mask,
    diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
    index 3e3c351b5c61..85ec027299d6 100644
    --- a/arch/x86/kvm/mmu.c
    +++ b/arch/x86/kvm/mmu.c
    @@ -5382,13 +5382,6 @@ int kvm_mmu_create(struct kvm_vcpu *vcpu)
    return alloc_mmu_pages(vcpu);
    }

    -void kvm_mmu_setup(struct kvm_vcpu *vcpu)
    -{
    - MMU_WARN_ON(VALID_PAGE(vcpu->arch.mmu->root_hpa));
    -
    - kvm_init_mmu(vcpu, true);
    -}
    -
    static void kvm_mmu_invalidate_zap_pages_in_memslot(struct kvm *kvm,
    struct kvm_memory_slot *slot,
    struct kvm_page_track_notifier_node *node)
    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index b49091a55865..5b53237148c8 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -8398,7 +8398,7 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
    kvm_vcpu_mtrr_init(vcpu);
    vcpu_load(vcpu);
    kvm_vcpu_reset(vcpu, false);
    - kvm_mmu_setup(vcpu);
    + kvm_init_mmu(vcpu, true);
    vcpu_put(vcpu);
    return 0;
    }
    --
    2.14.4
    \
     
     \ /
      Last update: 2018-08-02 12:02    [W:3.334 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site