Commit 546f3c67 authored by Luc Michel's avatar Luc Michel Committed by Peter Maydell
Browse files

gdbstub: add multiprocess support to 'D' packets 



'D' packets are used by GDB to detach from a process. In multiprocess
mode, the PID to detach from is sent in the request.

Signed-off-by: default avatarLuc Michel <luc.michel@greensocs.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Acked-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Message-id: 20181207090135.7651-11-luc.michel@greensocs.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 95567c27

gdbstub.c

+53 −7
Original line number Diff line number Diff line
@@ -1047,6 +1047,24 @@ static int gdb_breakpoint_remove(target_ulong addr, target_ulong len, int type) 
    }

}



static inline void gdb_cpu_breakpoint_remove_all(CPUState *cpu)

{

    cpu_breakpoint_remove_all(cpu, BP_GDB);

#ifndef CONFIG_USER_ONLY

    cpu_watchpoint_remove_all(cpu, BP_GDB);

#endif

}



static void gdb_process_breakpoint_remove_all(const GDBState *s, GDBProcess *p)

{

    CPUState *cpu = get_first_cpu_in_process(s, p);



    while (cpu) {

        gdb_cpu_breakpoint_remove_all(cpu);

        cpu = gdb_next_cpu_in_process(s, cpu);

    }

}



static void gdb_breakpoint_remove_all(void)

{

    CPUState *cpu;
@@ -1057,10 +1075,7 @@ static void gdb_breakpoint_remove_all(void) 
    }



    CPU_FOREACH(cpu) {

        cpu_breakpoint_remove_all(cpu, BP_GDB);

#ifndef CONFIG_USER_ONLY

        cpu_watchpoint_remove_all(cpu, BP_GDB);

#endif

        gdb_cpu_breakpoint_remove_all(cpu);

    }

}
@@ -1339,9 +1354,40 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) 
        exit(0);

    case 'D':

        /* Detach packet */

        gdb_breakpoint_remove_all();

        pid = 1;



        if (s->multiprocess) {

            unsigned long lpid;

            if (*p != ';') {

                put_packet(s, "E22");

                break;

            }



            if (qemu_strtoul(p + 1, &p, 16, &lpid)) {

                put_packet(s, "E22");

                break;

            }



            pid = lpid;

        }



        process = gdb_get_process(s, pid);

        gdb_process_breakpoint_remove_all(s, process);

        process->attached = false;



        if (pid == gdb_get_cpu_pid(s, s->c_cpu)) {

            s->c_cpu = gdb_first_attached_cpu(s);

        }



        if (pid == gdb_get_cpu_pid(s, s->g_cpu)) {

            s->g_cpu = gdb_first_attached_cpu(s);

        }



        if (s->c_cpu == NULL) {

            /* No more process attached */

            gdb_syscall_mode = GDB_SYS_DISABLED;

            gdb_continue(s);

        }

        put_packet(s, "OK");

        break;

    case 's':