From: Kyle Huey <me@kylehuey.com>
Date: Tue, 29 Nov 2016 20:40:41 +0000 (-0800)
Subject: KVM: x86: Do not clear RFLAGS.TF when a singlestep trap occurs.
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~8831^2~12
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ea07e42dec5644105db8a853575a0a271f93d294;p=mirror_ubuntu-focal-kernel.git

KVM: x86: Do not clear RFLAGS.TF when a singlestep trap occurs.

The trap flag stays set until software clears it.

Signed-off-by: Kyle Huey <khuey@kylehuey.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
---

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 7b38c5e6f412..dd6b41ea61b6 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5419,7 +5419,6 @@ static void kvm_vcpu_check_singlestep(struct kvm_vcpu *vcpu, unsigned long rflag
 			kvm_run->exit_reason = KVM_EXIT_DEBUG;
 			*r = EMULATE_USER_EXIT;
 		} else {
-			vcpu->arch.emulate_ctxt.eflags &= ~X86_EFLAGS_TF;
 			/*
 			 * "Certain debug exceptions may clear bit 0-3.  The
 			 * remaining contents of the DR6 register are never