Commit 50b143e1 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Drop kvm_arch_vcpu_free() 



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: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 208050da

arch/x86/kvm/x86.c

+11 −16
Original line number Diff line number Diff line
@@ -9170,20 +9170,6 @@ static void fx_init(struct kvm_vcpu *vcpu) 
	vcpu->arch.cr0 |= X86_CR0_ET;

}



void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)

{

	kvmclock_reset(vcpu);



	kvm_x86_ops->vcpu_free(vcpu);



	kvm_vcpu_uninit(vcpu);



	free_cpumask_var(vcpu->arch.wbinvd_dirty_mask);

	kmem_cache_free(x86_fpu_cache, vcpu->arch.user_fpu);

	kmem_cache_free(x86_fpu_cache, vcpu->arch.guest_fpu);

	kmem_cache_free(kvm_vcpu_cache, vcpu);

}



struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,

						unsigned int id)

{
@@ -9257,7 +9243,16 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) 


void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)

{

	kvm_arch_vcpu_free(vcpu);

	kvmclock_reset(vcpu);



	kvm_x86_ops->vcpu_free(vcpu);



	kvm_vcpu_uninit(vcpu);



	free_cpumask_var(vcpu->arch.wbinvd_dirty_mask);

	kmem_cache_free(x86_fpu_cache, vcpu->arch.user_fpu);

	kmem_cache_free(x86_fpu_cache, vcpu->arch.guest_fpu);

	kmem_cache_free(kvm_vcpu_cache, vcpu);

}



void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
@@ -9681,7 +9676,7 @@ static void kvm_free_vcpus(struct kvm *kvm) 
		kvm_unload_vcpu_mmu(vcpu);

	}

	kvm_for_each_vcpu(i, vcpu, kvm)

		kvm_arch_vcpu_free(vcpu);

		kvm_arch_vcpu_destroy(vcpu);



	mutex_lock(&kvm->lock);

	for (i = 0; i < atomic_read(&kvm->online_vcpus); i++)

CRA Git | Maintained and supported by SUSTech CRA and CCSE