diff mbox series

[v2,18/45] KVM: PPC: Drop kvm_arch_vcpu_free()

Message ID	20191218215530.2280-19-sean.j.christopherson@intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=UyFf=2I=vger.kernel.org=kvm-owner@kernel.org> From: Sean Christopherson <sean.j.christopherson@intel.com> To: Marc Zyngier <maz@kernel.org>, James Hogan <jhogan@kernel.org>, Paul Mackerras <paulus@ozlabs.org>, Christian Borntraeger <borntraeger@de.ibm.com>, Janosch Frank <frankja@linux.ibm.com>, Paolo Bonzini <pbonzini@redhat.com> Cc: James Morse <james.morse@arm.com>, Julien Thierry <julien.thierry.kdev@gmail.com>, Suzuki K Poulose <suzuki.poulose@arm.com>, David Hildenbrand <david@redhat.com>, Cornelia Huck <cohuck@redhat.com>, Sean Christopherson <sean.j.christopherson@intel.com>, Vitaly Kuznetsov <vkuznets@redhat.com>, Wanpeng Li <wanpengli@tencent.com>, Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-mips@vger.kernel.org, kvm-ppc@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kurz <groug@kaod.org> Subject: [PATCH v2 18/45] KVM: PPC: Drop kvm_arch_vcpu_free() Date: Wed, 18 Dec 2019 13:55:03 -0800 Message-Id: <20191218215530.2280-19-sean.j.christopherson@intel.com> In-Reply-To: <20191218215530.2280-1-sean.j.christopherson@intel.com> References: <20191218215530.2280-1-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: kvm-owner@vger.kernel.org Precedence: bulk
Series	KVM: Refactor vCPU creation \| expand [v2,00/45] KVM: Refactor vCPU creation [v2,01/45] KVM: PPC: Book3S HV: Uninit vCPU if vcore creation fails [v2,02/45] KVM: PPC: Book3S PR: Free shared page if mmu initialization fails [v2,03/45] KVM: x86: Free wbinvd_dirty_mask if vCPU creation fails [v2,04/45] KVM: VMX: Allocate VPID after initializing VCPU [v2,05/45] KVM: VMX: Use direct vcpu pointer during vCPU create/free [v2,06/45] KVM: SVM: Use direct vcpu pointer during vCPU create/free [v2,07/45] KVM: x86: Allocate vcpu struct in common x86 code [v2,08/45] KVM: x86: Move FPU allocation to common x86 code [v2,09/45] KVM: x86: Move allocation of pio_data page down a few lines [v2,10/45] KVM: x86: Move kvm_vcpu_init() invocation to common code [v2,11/45] KVM: PPC: e500mc: Add build-time assert that vcpu is at offset 0 [v2,12/45] KVM: PPC: Allocate vcpu struct in common PPC code [v2,13/45] KVM: PPC: Book3S PR: Allocate book3s and shadow vcpu after common init [v2,14/45] KVM: PPC: e500mc: Move reset of oldpir below call to kvm_vcpu_init() [v2,15/45] KVM: PPC: Move kvm_vcpu_init() invocation to common code [v2,16/45] KVM: MIPS: Use kvm_vcpu_cache to allocate vCPUs [v2,17/45] KVM: MIPS: Drop kvm_arch_vcpu_free() [v2,18/45] KVM: PPC: Drop kvm_arch_vcpu_free() [v2,19/45] KVM: arm: Drop kvm_arch_vcpu_free() [v2,20/45] KVM: x86: Remove spurious kvm_mmu_unload() from vcpu destruction path [v2,21/45] KVM: x86: Remove spurious clearing of async #PF MSR [v2,22/45] KVM: x86: Drop kvm_arch_vcpu_free() [v2,23/45] KVM: Remove kvm_arch_vcpu_free() declaration [v2,24/45] KVM: Add kvm_arch_vcpu_precreate() to handle pre-allocation issues [v2,25/45] KVM: s390: Move guts of kvm_arch_vcpu_init() into kvm_arch_vcpu_create() [v2,26/45] KVM: s390: Invoke kvm_vcpu_init() before allocating sie_page [v2,27/45] KVM: MIPS: Invoke kvm_vcpu_uninit() immediately prior to freeing vcpu [v2,28/45] KVM: x86: Invoke kvm_vcpu_uninit() immediately prior to freeing vcpu [v2,29/45] KVM: Introduce kvm_vcpu_destroy() [v2,30/45] KVM: Move vcpu alloc and init invocation to common code [v2,31/45] KVM: Unexport kvm_vcpu_cache and kvm_vcpu_{un}init() [v2,32/45] KVM: Move initialization of preempt notifier to kvm_vcpu_init() [v2,33/45] KVM: x86: Move guts of kvm_arch_vcpu_setup() into kvm_arch_vcpu_create() [v2,34/45] KVM: MIPS: Move .vcpu_setup() call to kvm_arch_vcpu_create() [v2,35/45] KVM: s390: Manually invoke vcpu setup during kvm_arch_vcpu_create() [v2,36/45] KVM: PPC: BookE: Setup vcpu during kvmppc_core_vcpu_create() [v2,37/45] KVM: Drop kvm_arch_vcpu_setup() [v2,38/45] KVM: x86: Move all vcpu init code into kvm_arch_vcpu_create() [v2,39/45] KVM: MIPS: Move all vcpu init code into kvm_arch_vcpu_create() [v2,40/45] KVM: ARM: Move all vcpu init code into kvm_arch_vcpu_create() [v2,41/45] KVM: PPC: Move all vcpu init code into kvm_arch_vcpu_create() [v2,42/45] KVM: arm64: Free sve_state via arm specific hook [v2,43/45] KVM: Drop kvm_arch_vcpu_init() and kvm_arch_vcpu_uninit() [v2,44/45] KVM: Move putting of vcpu->pid to kvm_vcpu_destroy() [v2,45/45] KVM: Move vcpu->run page allocation out of kvm_vcpu_init()

Commit Message

Sean Christopherson Dec. 18, 2019, 9:55 p.m. UTC

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>
---
 arch/powerpc/kvm/powerpc.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff mbox series

Patch

diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 173f57e0a1b5..a2ba708f5cec 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -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);