diff options
| author | Joerg Roedel | 2011-04-04 12:39:24 +0200 |
|---|---|---|
| committer | Avi Kivity | 2011-05-11 13:57:00 +0200 |
| commit | 775fde8648ebc588d07de39457aadc7c2131df2e (patch) | |
| tree | 56706d5d6eff4b5f02c911cbbbcf3b14648aee69 /arch/x86/kvm/x86.c | |
| parent | KVM: x86 emulator: add SVM intercepts (diff) | |
| download | kernel-qcow2-linux-775fde8648ebc588d07de39457aadc7c2131df2e.tar.gz kernel-qcow2-linux-775fde8648ebc588d07de39457aadc7c2131df2e.tar.xz kernel-qcow2-linux-775fde8648ebc588d07de39457aadc7c2131df2e.zip | |
KVM: x86 emulator: Don't write-back cpu-state on X86EMUL_INTERCEPTED
This patch prevents the changed CPU state to be written back
when the emulator detected that the instruction was
intercepted by the guest.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 36786bbb4c09..99bed74779d2 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4516,6 +4516,9 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, restart: r = x86_emulate_insn(&vcpu->arch.emulate_ctxt); + if (r == EMULATION_INTERCEPTED) + return EMULATE_DONE; + if (r == EMULATION_FAILED) { if (reexecute_instruction(vcpu, cr2)) return EMULATE_DONE; |