From 9c83a82910839edb3a0401a449d2da64260a13a0 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Sun, 28 Apr 2013 09:24:41 +0200
Subject: [PATCH] --- yaml --- r: 373133 b: refs/heads/master c:
 5a2892ce72e010e3cb96b438d7cdddce0c88e0e6 h: refs/heads/master i:   373131:
 5843de514a5d26fa2a28969f44bda0ed0de1138a v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/vmx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8aa47b841251..edaa150e37af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbf64358588ae45dcf0207dbc97fba783577d64a
+refs/heads/master: 5a2892ce72e010e3cb96b438d7cdddce0c88e0e6
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
index 74c525e2c608..e10217e99d2c 100644
--- a/trunk/arch/x86/kvm/vmx.c
+++ b/trunk/arch/x86/kvm/vmx.c
@@ -1917,7 +1917,7 @@ static void vmx_queue_exception(struct kvm_vcpu *vcpu, unsigned nr,
 	u32 intr_info = nr | INTR_INFO_VALID_MASK;
 
 	if (nr == PF_VECTOR && is_guest_mode(vcpu) &&
-		nested_pf_handled(vcpu))
+	    !vmx->nested.nested_run_pending && nested_pf_handled(vcpu))
 		return;
 
 	if (has_error_code) {