diff options
-rw-r--r-- | arch/x86/kvm/vmx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index fc4a255d5426..f9a54331c808 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -8046,8 +8046,6 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch) | |||
8046 | 8046 | ||
8047 | enter_guest_mode(vcpu); | 8047 | enter_guest_mode(vcpu); |
8048 | 8048 | ||
8049 | vmx->nested.nested_run_pending = 1; | ||
8050 | |||
8051 | vmx->nested.vmcs01_tsc_offset = vmcs_read64(TSC_OFFSET); | 8049 | vmx->nested.vmcs01_tsc_offset = vmcs_read64(TSC_OFFSET); |
8052 | 8050 | ||
8053 | cpu = get_cpu(); | 8051 | cpu = get_cpu(); |
@@ -8066,6 +8064,8 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch) | |||
8066 | if (vmcs12->guest_activity_state == GUEST_ACTIVITY_HLT) | 8064 | if (vmcs12->guest_activity_state == GUEST_ACTIVITY_HLT) |
8067 | return kvm_emulate_halt(vcpu); | 8065 | return kvm_emulate_halt(vcpu); |
8068 | 8066 | ||
8067 | vmx->nested.nested_run_pending = 1; | ||
8068 | |||
8069 | /* | 8069 | /* |
8070 | * Note no nested_vmx_succeed or nested_vmx_fail here. At this point | 8070 | * Note no nested_vmx_succeed or nested_vmx_fail here. At this point |
8071 | * we are no longer running L1, and VMLAUNCH/VMRESUME has not yet | 8071 | * we are no longer running L1, and VMLAUNCH/VMRESUME has not yet |