KVM: x86: emulator injects #DB when RFLAGS.RF is set

If the RFLAGS.RF is set, then no #DB should occur on instruction breakpoints.
However, the KVM emulator injects #DB regardless to RFLAGS.RF. This patch fixes
this behavior. KVM, however, still appears not to update RFLAGS.RF correctly,
regardless of this patch.

Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Nadav Amit 2014-07-17 01:19:31 +03:00 коммит произвёл Paolo Bonzini
Родитель 6c6cb69b8e
Коммит 4161a56906
1 изменённых файлов: 2 добавлений и 1 удалений

Просмотреть файл

@ -5158,7 +5158,8 @@ static bool kvm_vcpu_check_breakpoint(struct kvm_vcpu *vcpu, int *r)
} }
} }
if (unlikely(vcpu->arch.dr7 & DR7_BP_EN_MASK)) { if (unlikely(vcpu->arch.dr7 & DR7_BP_EN_MASK) &&
!(kvm_get_rflags(vcpu) & X86_EFLAGS_RF)) {
dr6 = kvm_vcpu_check_hw_bp(eip, 0, dr6 = kvm_vcpu_check_hw_bp(eip, 0,
vcpu->arch.dr7, vcpu->arch.dr7,
vcpu->arch.db); vcpu->arch.db);