Commit 37936ac7 authored by Liran Alon's avatar Liran Alon Committed by Paolo Bonzini
Browse files

target/i386: kvm: Use symbolic constant for #DB/#BP exception constants 



Reviewed-by: default avatarNikita Leshenko <nikita.leshchenko@oracle.com>
Reviewed-by: default avatarKrish Sadhukhan <krish.sadhukhan@oracle.com>
Signed-off-by: default avatarLiran Alon <liran.alon@oracle.com>
Message-Id: <20190619162140.133674-4-liran.alon@oracle.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b1115c99

target/i386/kvm.c

+4 −4
Original line number Diff line number Diff line
@@ -3345,9 +3345,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;
@@ -3859,8 +3859,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;

            }