Commit fbc2dfe5 authored by Peng Hao's avatar Peng Hao Committed by Paolo Bonzini
Browse files

KVM: nVMX: Make setup/unsetup under the same conditions 



Make sure nested_vmx_hardware_setup/unsetup() are called in pairs under
the same conditions.  Calling nested_vmx_hardware_unsetup() when nested
is false "works" right now because it only calls free_page() on zero-
initialized pointers, but it's possible that more code will be added to
nested_vmx_hardware_unsetup() in the future.

Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPeng Hao <flyingpeng@tencent.com>
Message-Id: <20220222104054.70286-1-flyingpeng@tencent.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c0f1eaeb

arch/x86/kvm/vmx/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -8049,7 +8049,7 @@ static __init int hardware_setup(void) 
	vmx_set_cpu_caps();



	r = alloc_kvm_area();

	if (r)

	if (r && nested)

		nested_vmx_hardware_unsetup();



	kvm_set_posted_intr_wakeup_handler(pi_wakeup_handler);