diff options
| author | Liran Alon <liran.alon@oracle.com> | 2019-06-19 19:21:33 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-06-21 02:29:39 +0200 |
| commit | 37936ac70f6c20aec6f537349eb797fb98f9a99d (patch) | |
| tree | 4d69eba0c206afc514b6d11016a91695a226d9a1 | |
| parent | b1115c99919cf158bb859865f14c3198a0e6f679 (diff) | |
| download | focaccia-qemu-37936ac70f6c20aec6f537349eb797fb98f9a99d.tar.gz focaccia-qemu-37936ac70f6c20aec6f537349eb797fb98f9a99d.zip | |
target/i386: kvm: Use symbolic constant for #DB/#BP exception constants
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>
| -rw-r--r-- | target/i386/kvm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 26d8c61a5f..c763643847 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -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; } |