|
@@ -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,
|
|
|
- vmcs12->vm_entry_msr_load_addr,
|
|
|
- vmcs12->vm_entry_msr_load_count);
|
|
|
- if (msr_entry_idx)
|
|
|
+ exit_qual = nested_vmx_load_msr(vcpu,
|
|
|
+ vmcs12->vm_entry_msr_load_addr,
|
|
|
+ vmcs12->vm_entry_msr_load_count);
|
|
|
+ if (exit_qual)
|
|
|
goto fail;
|
|
|
|
|
|
/*
|