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: Jim Mattson <jmattson@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 0b15b43ef45d7e9b7a50afd1daa2dc3138664967..29f85ed5a329d8aa998831b842f997eb607c907c 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -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);
 
-       /*
-        * 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.
-        */
        if (unlikely(vmx->fail)) {
+               /*
+                * 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.
+                */
                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;