From d34eccd9d957f924dad653dd938a149ac8cdb018 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Wed, 30 Apr 2008 17:59:04 +0200
Subject: [PATCH] --- yaml --- r: 95970 b: refs/heads/master c:
 b4f14abd95cd8d42f08438f1c4ec3eafe41054ee h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3bab2d182d66..5973947a4f32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ece15babfa514e06118f62f4df2c757d6209f4f0
+refs/heads/master: b4f14abd95cd8d42f08438f1c4ec3eafe41054ee
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index 017daa2561f4..bc224bba1e87 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -3022,6 +3022,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
 
 	kvm_x86_ops->decache_regs(vcpu);
 
+	vcpu->arch.exception.pending = false;
+
 	vcpu_put(vcpu);
 
 	return 0;