diff options
| author | Jan Kiszka | 2010-02-23 17:47:58 +0100 |
|---|---|---|
| committer | Avi Kivity | 2010-04-25 12:52:51 +0200 |
| commit | c310bac5a20fc37f761bd7297ba2e52cf40d79c6 (patch) | |
| tree | b5aed3e937691f8bf65857402535ece04ee47a58 /arch/x86/kvm/x86.c | |
| parent | KVM: SVM: Emulate nRIP feature when reinjecting INT3 (diff) | |
| download | kernel-qcow2-linux-c310bac5a20fc37f761bd7297ba2e52cf40d79c6.tar.gz kernel-qcow2-linux-c310bac5a20fc37f761bd7297ba2e52cf40d79c6.tar.xz kernel-qcow2-linux-c310bac5a20fc37f761bd7297ba2e52cf40d79c6.zip | |
KVM: x86: Drop RF manipulation for guest single-stepping
RF is not required for injecting TF as the latter will trigger only
after an instruction execution anyway. So do not touch RF when arming or
disarming guest single-step mode.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f2f246ae4a4c..a519fc6ed051 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -5884,7 +5884,7 @@ unsigned long kvm_get_rflags(struct kvm_vcpu *vcpu) rflags = kvm_x86_ops->get_rflags(vcpu); if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP) - rflags &= ~(unsigned long)(X86_EFLAGS_TF | X86_EFLAGS_RF); + rflags &= ~X86_EFLAGS_TF; return rflags; } EXPORT_SYMBOL_GPL(kvm_get_rflags); @@ -5893,7 +5893,7 @@ void kvm_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags) { if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP && kvm_is_linear_rip(vcpu, vcpu->arch.singlestep_rip)) - rflags |= X86_EFLAGS_TF | X86_EFLAGS_RF; + rflags |= X86_EFLAGS_TF; kvm_x86_ops->set_rflags(vcpu, rflags); } EXPORT_SYMBOL_GPL(kvm_set_rflags); |