From 0168573b58d5e70a60c9fef319ba510aa9648f2d Mon Sep 17 00:00:00 2001

From: Paolo Bonzini <pbonzini@redhat.com>

Date: Mon, 22 Jul 2019 18:22:09 +0100

Subject: [PATCH 28/39] target/i386: kvm: Use symbolic constant for #DB/#BP

 exception constants

RH-Author: Paolo Bonzini <pbonzini@redhat.com>

Message-id: <20190722182220.19374-8-pbonzini@redhat.com>

Patchwork-id: 89625

O-Subject: [RHEL-8.1.0 PATCH qemu-kvm v3 07/18] target/i386: kvm: Use symbolic constant for #DB/#BP exception constants

Bugzilla: 1689269

RH-Acked-by: Peter Xu <zhexu@redhat.com>

RH-Acked-by: Laurent Vivier <lvivier@redhat.com>

RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

From: Liran Alon <liran.alon@oracle.com>

Reviewed-by: Nikita Leshenko <nikita.leshchenko@oracle.com>

Reviewed-by: Krish Sadhukhan <krish.sadhukhan@oracle.com>

Signed-off-by: Liran Alon <liran.alon@oracle.com>

Message-Id: <20190619162140.133674-4-liran.alon@oracle.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

(cherry picked from commit 37936ac70f6c20aec6f537349eb797fb98f9a99d)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 target/i386/kvm.c | 8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/target/i386/kvm.c b/target/i386/kvm.c

index 305809f..4138fe9 100644

--- a/target/i386/kvm.c

+++ b/target/i386/kvm.c

@@ -2811,9 +2811,9 @@ static int kvm_guest_debug_workarounds(X86CPU *cpu)

     unsigned long reinject_trap = 0;

     if (!kvm_has_vcpu_events()) {

-        if (env->exception_injected == 1) {

+        if (env->exception_injected == EXCP01_DB) {

             reinject_trap = KVM_GUESTDBG_INJECT_DB;

-        } else if (env->exception_injected == 3) {

+        } else if (env->exception_injected == EXCP03_INT3) {

             reinject_trap = KVM_GUESTDBG_INJECT_BP;

         }

         env->exception_injected = -1;

@@ -3325,8 +3325,8 @@ static int kvm_handle_debug(X86CPU *cpu,

     int ret = 0;

     int n;

-    if (arch_info->exception == 1) {

-        if (arch_info->dr6 & (1 << 14)) {

+    if (arch_info->exception == EXCP01_DB) {

+        if (arch_info->dr6 & DR6_BS) {

             if (cs->singlestep_enabled) {

                 ret = EXCP_DEBUG;

             }

-- 

1.8.3.1