Re: [Qemu-devel] [PATCH 02/12] Return appropriate watch message to gdb

[Anthony Liguori <anthony@codemonkey.ws>]

Jan Kiszka wrote:
> Return the appropriate type prefix (r, a, none) when reporting
> watchpoint hits to the gdb front-end.
>   

This doesn't build on it's own (there is no flags field in watchpoint).

Regards,

Anthony Liguori

> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  gdbstub.c |   17 +++++++++++++++--
>  1 file changed, 15 insertions(+), 2 deletions(-)
>
> Index: b/gdbstub.c
> ===================================================================
> --- a/gdbstub.c
> +++ b/gdbstub.c
> @@ -1493,6 +1493,7 @@ static void gdb_vm_stopped(void *opaque,
>  {
>      GDBState *s = opaque;
>      char buf[256];
> +    const char *type;
>      int ret;
>  
>      if (s->state == RS_SYSCALL)
> @@ -1503,8 +1504,20 @@ static void gdb_vm_stopped(void *opaque,
>  
>      if (reason == EXCP_DEBUG) {
>          if (s->env->watchpoint_hit) {
> -            snprintf(buf, sizeof(buf), "T%02xwatch:" TARGET_FMT_lx ";",
> -                     SIGTRAP,
> +            switch (s->env->watchpoint[s->env->watchpoint_hit - 1].flags &
> +                    (PAGE_READ | PAGE_WRITE)) {
> +            case PAGE_READ:
> +                type = "r";
> +                break;
> +            case PAGE_READ | PAGE_WRITE:
> +                type = "a";
> +                break;
> +            default:
> +                type = "";
> +                break;
> +            }
> +            snprintf(buf, sizeof(buf), "T%02x%swatch:" TARGET_FMT_lx ";",
> +                     SIGTRAP, type,
>                       s->env->watchpoint[s->env->watchpoint_hit - 1].vaddr);
>              put_packet(s, buf);
>              s->env->watchpoint_hit = 0;
>
>
>
>