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

Commit 0b88abdc authored by Jim Mattson's avatar Jim Mattson Committed by Paolo Bonzini
Browse files

kvm: nVMX: Restore exit qual for VM-entry failure due to MSR loading 



This exit qualification was inadvertently dropped when the two
VM-entry failure blocks were coalesced.

Fixes: e79f245d ("X86/KVM: Properly update 'tsc_offset' to represent the running guest")
Signed-off-by: default avatarJim Mattson <jmattson@google.com>
Reviewed-by: default avatarKrish Sadhukhan <krish.sadhukhan@oracle.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b062b794

arch/x86/kvm/vmx.c

+4 −5
Original line number Diff line number Diff line
@@ -11431,7 +11431,6 @@ static int enter_vmx_non_root_mode(struct kvm_vcpu *vcpu, bool from_vmentry) 
{

	struct vcpu_vmx *vmx = to_vmx(vcpu);

	struct vmcs12 *vmcs12 = get_vmcs12(vcpu);

	u32 msr_entry_idx;

	u32 exit_qual;

	int r;
@@ -11453,10 +11452,10 @@ static int enter_vmx_non_root_mode(struct kvm_vcpu *vcpu, bool from_vmentry) 
	nested_get_vmcs12_pages(vcpu, vmcs12);



	r = EXIT_REASON_MSR_LOAD_FAIL;

	msr_entry_idx = nested_vmx_load_msr(vcpu,

	exit_qual = nested_vmx_load_msr(vcpu,

					vmcs12->vm_entry_msr_load_addr,

					vmcs12->vm_entry_msr_load_count);

	if (msr_entry_idx)

	if (exit_qual)

		goto fail;



	/*