---

yaml --- r: 95970 b: refs/heads/master c: b4f14ab h: refs/heads/master v: v3
git-mirror · May 4, 2008 · d34eccd · d34eccd
1 parent b676269
commit d34eccd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;