From 35e20d90f4af067929cabc7ec90e33e8ef8457f8 Mon Sep 17 00:00:00 2001 From: Nadav Har'El Date: Thu, 2 Jun 2011 11:54:52 +0300 Subject: [PATCH] --- yaml --- r: 258028 b: refs/heads/master c: 509c75ea198fe524adaf90ca1021487b733447ce h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/vmx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fd1878997d19..eb90b069d2da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f4382e8fd8c87bcb7122a2f63c03e8713f594a0 +refs/heads/master: 509c75ea198fe524adaf90ca1021487b733447ce diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c index 58badf1657d4..f5b49c7fc89d 100644 --- a/trunk/arch/x86/kvm/vmx.c +++ b/trunk/arch/x86/kvm/vmx.c @@ -5694,8 +5694,8 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu) if (vmx->nested.nested_run_pending) kvm_make_request(KVM_REQ_EVENT, vcpu); - if (exit_reason == EXIT_REASON_VMLAUNCH || - exit_reason == EXIT_REASON_VMRESUME) + if (!is_guest_mode(vcpu) && (exit_reason == EXIT_REASON_VMLAUNCH || + exit_reason == EXIT_REASON_VMRESUME)) vmx->nested.nested_run_pending = 1; else vmx->nested.nested_run_pending = 0;