KVM: PPC: Drop kvm_arch_vcpu_free() (d5279f3a) · Commits · 戴 / test

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> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/powerpc/kvm/powerpc.c

+2 −7

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_free(vcpu);
		kvm_arch_vcpu_destroy(vcpu);

		mutex_lock(&kvm->lock);
		for (i = 0; i < atomic_read(&kvm->online_vcpus); i++)
		@@ -752,7 +752,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)
		{
		/* Make sure we're not using the vcpu anymore */
		hrtimer_cancel(&vcpu->arch.dec_timer);
		@@ -781,11 +781,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 kvmppc_core_pending_dec(vcpu);

Admin message