Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7af40ad3 authored by Jan Kiszka's avatar Jan Kiszka Committed by Paolo Bonzini
Browse files

KVM: nVMX: Fix nested_run_pending on activity state HLT 



When we suspend the guest in HLT state, the nested run is no longer
pending - we emulated it completely. So only set nested_run_pending
after checking the activity state.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent cae50139

arch/x86/kvm/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -8046,8 +8046,6 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch) 


	enter_guest_mode(vcpu);



	vmx->nested.nested_run_pending = 1;



	vmx->nested.vmcs01_tsc_offset = vmcs_read64(TSC_OFFSET);



	cpu = get_cpu();
@@ -8066,6 +8064,8 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch) 
	if (vmcs12->guest_activity_state == GUEST_ACTIVITY_HLT)

		return kvm_emulate_halt(vcpu);



	vmx->nested.nested_run_pending = 1;



	/*

	 * Note no nested_vmx_succeed or nested_vmx_fail here. At this point

	 * we are no longer running L1, and VMLAUNCH/VMRESUME has not yet