Commit d2423b34 authored Dec 18, 2019 by Sean Christopherson Committed by Paolo Bonzini Jan 24, 2020

KVM: x86: Invoke kvm_vcpu_uninit() immediately prior to freeing vcpu

Move the call to kvm_vcpu_uninit() in kvm_arch_vcpu_destroy() down a few
lines so that it is invoked immediately prior to freeing the vCPU. This
paves the way for moving the uninit and free sequence to common KVM code
without an associated functional change.

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

parent aaf532c5

arch/x86/kvm/x86.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -9251,11 +9251,11 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *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);

		kvm_vcpu_uninit(vcpu);
		kmem_cache_free(kvm_vcpu_cache, vcpu);
		}

Admin message