Commit 26eef70c authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: Clear exception queue before emulating an instruction 



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: default avatarAvi Kivity <avi@qumranet.com>
parent 668f612f

arch/x86/kvm/x86.c

+2 −0
Original line number Diff line number Diff line
@@ -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

arch/x86/kvm/x86.h

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#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