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

Commit 7881f96c authored by Jim Mattson's avatar Jim Mattson Committed by Paolo Bonzini
Browse files

kvm: nVMX: Remove nested_vmx_succeed after successful VM-entry 



After a successful VM-entry, RFLAGS is cleared, with the exception of
bit 1, which is always set. This is handled by load_vmcs12_host_state.

Signed-off-by: default avatarJim Mattson <jmattson@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4c0b4bc6

arch/x86/kvm/vmx.c

+9 −7
Original line number Diff line number Diff line
@@ -11491,16 +11491,18 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, 
	 */

	kvm_make_request(KVM_REQ_APIC_PAGE_RELOAD, vcpu);



	if (unlikely(vmx->fail)) {

		/*

	 * Exiting from L2 to L1, we're now back to L1 which thinks it just

	 * finished a VMLAUNCH or VMRESUME instruction, so we need to set the

	 * success or failure flag accordingly.

		 * After an early L2 VM-entry failure, we're now back

		 * in L1 which thinks it just finished a VMLAUNCH or

		 * VMRESUME instruction, so we need to set the failure

		 * flag and the VM-instruction error field of the VMCS

		 * accordingly.

		 */

	if (unlikely(vmx->fail)) {

		vmx->fail = 0;

		nested_vmx_failValid(vcpu, vm_inst_error);

	} else

		nested_vmx_succeed(vcpu);

	}



	if (enable_shadow_vmcs)

		vmx->nested.sync_shadow_vmcs = true;