lkml.org 
[lkml]   [2019]   [Oct]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 19/45] KVM: arm: Drop kvm_arch_vcpu_free()
    Date
    Remove the superfluous kvm_arch_vcpu_free() as it is no longer called
    from commmon KVM code. Note, kvm_arch_vcpu_destroy() *is* called from
    common code, i.e. choosing which function to whack is not completely
    arbitrary.

    Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
    ---
    virt/kvm/arm/arm.c | 9 ++-------
    1 file changed, 2 insertions(+), 7 deletions(-)

    diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
    index 86c6aa1cb58e..266d78fbc86c 100644
    --- a/virt/kvm/arm/arm.c
    +++ b/virt/kvm/arm/arm.c
    @@ -170,7 +170,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)

    for (i = 0; i < KVM_MAX_VCPUS; ++i) {
    if (kvm->vcpus[i]) {
    - kvm_arch_vcpu_free(kvm->vcpus[i]);
    + kvm_arch_vcpu_destroy(kvm->vcpus[i]);
    kvm->vcpus[i] = NULL;
    }
    }
    @@ -295,7 +295,7 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
    {
    }

    -void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)
    +void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
    {
    if (vcpu->arch.has_run_once && unlikely(!irqchip_in_kernel(vcpu->kvm)))
    static_branch_dec(&userspace_irqchip_in_use);
    @@ -307,11 +307,6 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)
    kmem_cache_free(kvm_vcpu_cache, vcpu);
    }

    -void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
    -{
    - kvm_arch_vcpu_free(vcpu);
    -}
    -
    int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)
    {
    return kvm_timer_is_pending(vcpu);
    --
    2.22.0
    \
     
     \ /
      Last update: 2019-10-22 04:00    [W:4.116 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site