From: Liran Alon <liran.alon@oracle.com>
To: qemu-devel@nongnu.org
Cc: ehabkost@redhat.com, kvm@vger.kernel.org,
maran.wilson@oracle.com, mtosatti@redhat.com,
dgilbert@redhat.com, Liran Alon <liran.alon@oracle.com>,
Nikita Leshenko <nikita.leshchenko@oracle.com>,
Krish Sadhukhan <krish.sadhukhan@oracle.com>,
pbonzini@redhat.com, rth@twiddle.net, jmattson@google.com
Subject: [Qemu-devel] [QEMU PATCH v3 2/9] KVM: i386: Use symbolic constant for #DB/#BP exception constants
Date: Mon, 17 Jun 2019 20:56:51 +0300 [thread overview]
Message-ID: <20190617175658.135869-3-liran.alon@oracle.com> (raw)
In-Reply-To: <20190617175658.135869-1-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>
---
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 29889aa6b001..738dd91ff3cc 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -3006,9 +3006,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;
@@ -3520,8 +3520,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;
}
--
2.20.1
next prev parent reply other threads:[~2019-06-17 18:00 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-17 17:56 [Qemu-devel] [QEMU PATCH v3 0/9]: KVM: i386: Add support for save and restore of nested state Liran Alon
2019-06-17 17:56 ` [Qemu-devel] [QEMU PATCH v3 1/9] KVM: Introduce kvm_arch_destroy_vcpu() Liran Alon
2019-06-18 22:15 ` Maran Wilson
2019-06-17 17:56 ` Liran Alon [this message]
2019-06-17 17:56 ` [Qemu-devel] [QEMU PATCH v3 3/9] KVM: i386: Re-inject #DB to guest with updated DR6 Liran Alon
2019-06-17 17:56 ` [Qemu-devel] [QEMU PATCH v3 4/9] KVM: i386: Block migration for vCPUs exposed with nested virtualization Liran Alon
2019-06-18 8:44 ` Dr. David Alan Gilbert
2019-06-18 22:16 ` Maran Wilson
2019-06-17 17:56 ` [Qemu-devel] [QEMU PATCH v3 5/9] linux-headers: i386: Modify struct kvm_nested_state to have explicit fields for data Liran Alon
2019-06-18 22:16 ` Maran Wilson
2019-06-17 17:56 ` [Qemu-devel] [QEMU PATCH v3 6/9] vmstate: Add support for kernel integer types Liran Alon
2019-06-18 8:55 ` Dr. David Alan Gilbert
2019-06-18 15:36 ` Liran Alon
2019-06-18 15:42 ` Dr. David Alan Gilbert
2019-06-18 16:44 ` Paolo Bonzini
2019-06-17 17:56 ` [Qemu-devel] [QEMU PATCH v3 7/9] KVM: i386: Add support for save and restore nested state Liran Alon
2019-06-18 9:03 ` Dr. David Alan Gilbert
2019-06-18 15:40 ` Liran Alon
2019-06-18 15:48 ` Dr. David Alan Gilbert
2019-06-18 15:50 ` Liran Alon
2019-06-18 16:16 ` Paolo Bonzini
2019-06-18 22:16 ` Maran Wilson
2019-06-17 17:56 ` [Qemu-devel] [QEMU PATCH v3 8/9] KVM: i386: Add support for KVM_CAP_EXCEPTION_PAYLOAD Liran Alon
2019-06-18 9:07 ` Dr. David Alan Gilbert
2019-06-18 15:45 ` Liran Alon
2019-06-17 17:56 ` [Qemu-devel] [QEMU PATCH v3 9/9] KVM: i386: Remove VMX migration blocker Liran Alon
2019-06-18 22:17 ` Maran Wilson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190617175658.135869-3-liran.alon@oracle.com \
--to=liran.alon@oracle.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jmattson@google.com \
--cc=krish.sadhukhan@oracle.com \
--cc=kvm@vger.kernel.org \
--cc=maran.wilson@oracle.com \
--cc=mtosatti@redhat.com \
--cc=nikita.leshchenko@oracle.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).