]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
KVM: Clear exception queue before emulating an instruction
authorAvi Kivity <avi@qumranet.com>
Thu, 3 Jul 2008 11:59:22 +0000 (14:59 +0300)
committerAvi Kivity <avi@qumranet.com>
Wed, 15 Oct 2008 08:15:13 +0000 (10:15 +0200)
If we're emulating an instruction, either it will succeed, in which case
any previously queued exception will be spurious, or we will requeue the
same exception.

Signed-off-by: Avi Kivity <avi@qumranet.com>
arch/x86/kvm/x86.c
arch/x86/kvm/x86.h [new file with mode: 0644]

index 2f0696bc7d2f63b0a458709ff1d6736d4144e7af..5620df2685dbc29963d2bdb9200d4d6893e3b392 100644 (file)
@@ -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/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
new file mode 100644 (file)
index 0000000..c666649
--- /dev/null
@@ -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