mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gdbstub: Call gdbserver_fork() both in parent and in child 

The upcoming follow-fork-mode child support requires post-fork message
exchange between the parent and the child. Prepare gdbserver_fork() for
this purpose. Rename it to gdbserver_fork_end() to better reflect its
purpose.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-Id: <20240219141628.246823-8-iii@linux.ibm.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240305121005.3528075-9-alex.bennee@linaro.org>
This commit is contained in:
Ilya Leoshkevich 2024-03-05 12:09:44 +00:00 committed by Alex Bennée
parent 9d456e092d
commit 6604b05763
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bsd-user/main.c
View File

@ -138,10 +138,11 @@ void fork_end(pid_t pid)
*/ */
qemu_init_cpu_list(); qemu_init_cpu_list();
get_task_state(thread_cpu)->ts_tid = qemu_get_thread_id(); get_task_state(thread_cpu)->ts_tid = qemu_get_thread_id();
gdbserver_fork(thread_cpu, pid); gdbserver_fork_end(thread_cpu, pid);
} else { } else {
mmap_fork_end(child); mmap_fork_end(child);
cpu_list_unlock(); cpu_list_unlock();
gdbserver_fork_end(thread_cpu, pid);
end_exclusive(); end_exclusive();
} }
} }

5
gdbstub/user.c
View File

@ -374,10 +374,9 @@ static void disable_gdbstub(CPUState *thread_cpu)
tb_flush(thread_cpu); tb_flush(thread_cpu);
} }
/* Disable gdb stub for child processes. */ void gdbserver_fork_end(CPUState *cpu, pid_t pid)
void gdbserver_fork(CPUState *cpu, pid_t pid)
{ {
if (!gdbserver_state.init || gdbserver_user_state.fd < 0) { if (pid != 0 || !gdbserver_state.init || gdbserver_user_state.fd < 0) {
return; return;
} }
disable_gdbstub(cpu); disable_gdbstub(cpu);

5
include/gdbstub/user.h
View File

@ -51,10 +51,11 @@ void gdb_signalled(CPUArchState *as, int sig);
void gdbserver_fork_start(void); void gdbserver_fork_start(void);
/** /**
* gdbserver_fork() - disable gdb stub for child processes. * gdbserver_fork_end() - inform gdb of the completed fork()
* @cs: CPU * @cs: CPU
* @pid: 0 if in child process, -1 if fork failed, child process pid otherwise
*/ */
void gdbserver_fork(CPUState *cs, pid_t pid); void gdbserver_fork_end(CPUState *cs, pid_t pid);
/** /**
* gdb_syscall_entry() - inform gdb of syscall entry and yield control to it * gdb_syscall_entry() - inform gdb of syscall entry and yield control to it

2
linux-user/main.c
View File

@ -165,10 +165,10 @@ void fork_end(pid_t pid)
} }
qemu_init_cpu_list(); qemu_init_cpu_list();
get_task_state(thread_cpu)->ts_tid = qemu_get_thread_id(); get_task_state(thread_cpu)->ts_tid = qemu_get_thread_id();
gdbserver_fork(thread_cpu, pid);
} else { } else {
cpu_list_unlock(); cpu_list_unlock();
} }
gdbserver_fork_end(thread_cpu, pid);
/* /*
* qemu_init_cpu_list() reinitialized the child exclusive state, but we * qemu_init_cpu_list() reinitialized the child exclusive state, but we
* also need to keep current_cpu consistent, so call end_exclusive() for * also need to keep current_cpu consistent, so call end_exclusive() for