diff options
| author | Nadav Amit | 2014-07-21 13:37:26 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2014-07-21 13:41:32 +0200 |
| commit | bb663c7ada380f3c89c2f83fdbe2b3626621385d (patch) | |
| tree | e57e04c0f2820e57b8f27f80216fc6880af55c3b /arch/x86/kvm/x86.c | |
| parent | Merge tag 'kvm-s390-20140715' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | kernel-qcow2-linux-bb663c7ada380f3c89c2f83fdbe2b3626621385d.tar.gz kernel-qcow2-linux-bb663c7ada380f3c89c2f83fdbe2b3626621385d.tar.xz kernel-qcow2-linux-bb663c7ada380f3c89c2f83fdbe2b3626621385d.zip | |
KVM: x86: Clearing rflags.rf upon skipped emulated instruction
When skipping an emulated instruction, rflags.rf should be cleared as it would
be on real x86 CPU.
Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f750b69ca443..1fd806cb96d4 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -5229,6 +5229,8 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, if (emulation_type & EMULTYPE_SKIP) { kvm_rip_write(vcpu, ctxt->_eip); + if (ctxt->eflags & X86_EFLAGS_RF) + kvm_set_rflags(vcpu, ctxt->eflags & ~X86_EFLAGS_RF); return EMULATE_DONE; } |