Commit 4543bdc0 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: Introduce kvm_vcpu_destroy() 



Add kvm_vcpu_destroy() and wire up all architectures to call the common
function instead of their arch specific implementation.  The common
destruction function will be used by future patches to move allocation
and initialization of vCPUs to common KVM code, i.e. to free resources
that are allocated by arch agnostic code.

No functional change intended.

Acked-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d2423b34

arch/mips/kvm/mips.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ void kvm_mips_free_vcpus(struct kvm *kvm) 
	struct kvm_vcpu *vcpu;



	kvm_for_each_vcpu(i, vcpu, kvm) {

		kvm_arch_vcpu_destroy(vcpu);

		kvm_vcpu_destroy(vcpu);

	}



	mutex_lock(&kvm->lock);

arch/powerpc/kvm/powerpc.c

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm) 
#endif



	kvm_for_each_vcpu(i, vcpu, kvm)

		kvm_arch_vcpu_destroy(vcpu);

		kvm_vcpu_destroy(vcpu);



	mutex_lock(&kvm->lock);

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

arch/s390/kvm/kvm-s390.c

+1 −1
Original line number Diff line number Diff line
@@ -2541,7 +2541,7 @@ static void kvm_free_vcpus(struct kvm *kvm) 
	struct kvm_vcpu *vcpu;



	kvm_for_each_vcpu(i, vcpu, kvm)

		kvm_arch_vcpu_destroy(vcpu);

		kvm_vcpu_destroy(vcpu);



	mutex_lock(&kvm->lock);

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

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -9680,7 +9680,7 @@ static void kvm_free_vcpus(struct kvm *kvm) 
		kvm_unload_vcpu_mmu(vcpu);

	}

	kvm_for_each_vcpu(i, vcpu, kvm)

		kvm_arch_vcpu_destroy(vcpu);

		kvm_vcpu_destroy(vcpu);



	mutex_lock(&kvm->lock);

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

include/linux/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -581,6 +581,7 @@ static inline int kvm_vcpu_get_idx(struct kvm_vcpu *vcpu) 


int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id);

void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);

void kvm_vcpu_destroy(struct kvm_vcpu *vcpu);



void vcpu_load(struct kvm_vcpu *vcpu);

void vcpu_put(struct kvm_vcpu *vcpu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE