From: David Gibson <david@gibson.dropbear.id.au>
To: Fabiano Rosas <farosas@linux.ibm.com>
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>,
Paolo Bonzini <pbonzini@redhat.com>,
qemu-ppc@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [PATCH v6 1/3] target/ppc: Clarify the meaning of return values in kvm_handle_debug
Date: Fri, 17 Jan 2020 19:24:50 +1000 [thread overview]
Message-ID: <20200117092450.GX54439@umbus> (raw)
In-Reply-To: <20200110151344.278471-2-farosas@linux.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 2916 bytes --]
On Fri, Jan 10, 2020 at 12:13:42PM -0300, Fabiano Rosas wrote:
> The kvm_handle_debug function can return 0 to go back into the guest
> or return 1 to notify the gdbstub thread and pass control to GDB.
>
> Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
Good change regardless of the rest of the series. Applied to
ppc-for-5.0.
> ---
> target/ppc/kvm.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index d1c334f0e3..0bd4a8d399 100644
> --- a/target/ppc/kvm.c
> +++ b/target/ppc/kvm.c
> @@ -53,6 +53,9 @@
>
> #define PROC_DEVTREE_CPU "/proc/device-tree/cpus/"
>
> +#define DEBUG_RETURN_GUEST 0
> +#define DEBUG_RETURN_GDB 1
> +
> const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
> KVM_CAP_LAST_INFO
> };
> @@ -1570,7 +1573,7 @@ void kvm_arch_update_guest_debug(CPUState *cs, struct kvm_guest_debug *dbg)
> static int kvm_handle_hw_breakpoint(CPUState *cs,
> struct kvm_debug_exit_arch *arch_info)
> {
> - int handle = 0;
> + int handle = DEBUG_RETURN_GUEST;
> int n;
> int flag = 0;
>
> @@ -1578,13 +1581,13 @@ static int kvm_handle_hw_breakpoint(CPUState *cs,
> if (arch_info->status & KVMPPC_DEBUG_BREAKPOINT) {
> n = find_hw_breakpoint(arch_info->address, GDB_BREAKPOINT_HW);
> if (n >= 0) {
> - handle = 1;
> + handle = DEBUG_RETURN_GDB;
> }
> } else if (arch_info->status & (KVMPPC_DEBUG_WATCH_READ |
> KVMPPC_DEBUG_WATCH_WRITE)) {
> n = find_hw_watchpoint(arch_info->address, &flag);
> if (n >= 0) {
> - handle = 1;
> + handle = DEBUG_RETURN_GDB;
> cs->watchpoint_hit = &hw_watchpoint;
> hw_watchpoint.vaddr = hw_debug_points[n].addr;
> hw_watchpoint.flags = flag;
> @@ -1596,12 +1599,12 @@ static int kvm_handle_hw_breakpoint(CPUState *cs,
>
> static int kvm_handle_singlestep(void)
> {
> - return 1;
> + return DEBUG_RETURN_GDB;
> }
>
> static int kvm_handle_sw_breakpoint(void)
> {
> - return 1;
> + return DEBUG_RETURN_GDB;
> }
>
> static int kvm_handle_debug(PowerPCCPU *cpu, struct kvm_run *run)
> @@ -1653,7 +1656,7 @@ static int kvm_handle_debug(PowerPCCPU *cpu, struct kvm_run *run)
> env->error_code = POWERPC_EXCP_INVAL;
> ppc_cpu_do_interrupt(cs);
>
> - return 0;
> + return DEBUG_RETURN_GUEST;
> }
>
> int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2020-01-17 12:28 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-10 15:13 [PATCH v6 0/3] target/ppc: single step for KVM HV Fabiano Rosas
2020-01-10 15:13 ` [PATCH v6 1/3] target/ppc: Clarify the meaning of return values in kvm_handle_debug Fabiano Rosas
2020-01-17 9:24 ` David Gibson [this message]
2020-01-10 15:13 ` [PATCH v6 2/3] kvm-all: Introduce kvm_set_singlestep Fabiano Rosas
2020-01-17 9:27 ` David Gibson
2020-01-17 9:30 ` David Gibson
2020-01-10 15:13 ` [PATCH v6 3/3] target/ppc: support single stepping with KVM HV Fabiano Rosas
2020-01-20 2:35 ` David Gibson
2020-01-20 20:11 ` Fabiano Rosas
2020-01-21 3:32 ` David Gibson
2020-01-21 20:23 ` Fabiano Rosas
2020-01-22 3:11 ` David Gibson
2020-01-22 19:34 ` Fabiano Rosas
2020-01-16 14:41 ` [PATCH v6 0/3] target/ppc: single step for " Leonardo Bras
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=20200117092450.GX54439@umbus \
--to=david@gibson.dropbear.id.au \
--cc=aik@ozlabs.ru \
--cc=farosas@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/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).