From 7d8db90700257b906514927de420ec6bb4b55939 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Thu, 3 Jul 2008 14:59:22 +0300
Subject: [PATCH] --- yaml --- r: 115231 b: refs/heads/master c:
 26eef70c3e8c76e73dff2579c792fc7355f8a291 h: refs/heads/master i:   115229:
 9ad444640cf4aa52e680eb43d13c0bf99ef6a7b8   115227:
 70b9a19a0169feb8693cc90bf39a56b1fd910c60   115223:
 d1de1293c20cfa572c4c39b64819c2fbb5142184   115215:
 ed2abb34c57fa3c54ef74a6d989897310ea2172d   115199:
 294948659397279fd0ffc27f79fd09925cbb404a v: v3

---
 [refs]                   |  2 +-
 trunk/arch/x86/kvm/x86.c |  2 ++
 trunk/arch/x86/kvm/x86.h | 11 +++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 trunk/arch/x86/kvm/x86.h

diff --git a/[refs] b/[refs]
index 39dbc32e0c2e..98cda755438d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 668f612fa0d8d4120ec5dc0725d7e1ca3152a954
+refs/heads/master: 26eef70c3e8c76e73dff2579c792fc7355f8a291
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index 2f0696bc7d2f..5620df2685db 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -20,6 +20,7 @@
 #include "i8254.h"
 #include "tss.h"
 #include "kvm_cache_regs.h"
+#include "x86.h"
 
 #include <linux/clocksource.h>
 #include <linux/kvm.h>
@@ -2121,6 +2122,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
 	int r;
 	struct decode_cache *c;
 
+	kvm_clear_exception_queue(vcpu);
 	vcpu->arch.mmio_fault_cr2 = cr2;
 	/*
 	 * TODO: fix x86_emulate.c to use guest_read/write_register
diff --git a/trunk/arch/x86/kvm/x86.h b/trunk/arch/x86/kvm/x86.h
new file mode 100644
index 000000000000..c666649c4bb2
--- /dev/null
+++ b/trunk/arch/x86/kvm/x86.h
@@ -0,0 +1,11 @@
+#ifndef ARCH_X86_KVM_X86_H
+#define ARCH_X86_KVM_X86_H
+
+#include <linux/kvm_host.h>
+
+static inline void kvm_clear_exception_queue(struct kvm_vcpu *vcpu)
+{
+	vcpu->arch.exception.pending = false;
+}
+
+#endif