KVM: arm: Drop kvm_arch_vcpu_free() (4b8fff78) · 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. Acked-by:

Christoffer Dall <christoffer.dall@arm.com> Signed-off-by:

Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

virt/kvm/arm/arm.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -194,7 +194,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;
		}
		}
		@@ -321,7 +321,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);
		@@ -333,11 +333,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);

Admin message