mirror of https://github.com/proxmox/mirror_qemu
gdbstub: replace exit calls with proper shutdown for softmmu
This replaces the exit calls by shutdown requests, ensuring a proper cleanup of Qemu. Features like net/vhost-vdpa.c are expecting qemu_cleanup to be called to remove their last residuals. Signed-off-by: Clément Chigot <chigot@adacore.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Message-ID: <20231003071427.188697-6-chigot@adacore.com> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>master
parent
354c96069c
commit
e216256ae9
|
@ -1324,7 +1324,7 @@ static void handle_v_kill(GArray *params, void *user_ctx)
|
||||||
gdb_put_packet("OK");
|
gdb_put_packet("OK");
|
||||||
error_report("QEMU: Terminated via GDBstub");
|
error_report("QEMU: Terminated via GDBstub");
|
||||||
gdb_exit(0);
|
gdb_exit(0);
|
||||||
exit(0);
|
gdb_qemu_exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const GdbCmdParseEntry gdb_v_commands_table[] = {
|
static const GdbCmdParseEntry gdb_v_commands_table[] = {
|
||||||
|
@ -1843,7 +1843,8 @@ static int gdb_handle_packet(const char *line_buf)
|
||||||
/* Kill the target */
|
/* Kill the target */
|
||||||
error_report("QEMU: Terminated via GDBstub");
|
error_report("QEMU: Terminated via GDBstub");
|
||||||
gdb_exit(0);
|
gdb_exit(0);
|
||||||
exit(0);
|
gdb_qemu_exit(0);
|
||||||
|
break;
|
||||||
case 'D':
|
case 'D':
|
||||||
{
|
{
|
||||||
static const GdbCmdParseEntry detach_cmd_desc = {
|
static const GdbCmdParseEntry detach_cmd_desc = {
|
||||||
|
|
|
@ -435,6 +435,12 @@ void gdb_exit(int code)
|
||||||
qemu_chr_fe_deinit(&gdbserver_system_state.chr, true);
|
qemu_chr_fe_deinit(&gdbserver_system_state.chr, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void gdb_qemu_exit(int code)
|
||||||
|
{
|
||||||
|
qemu_system_shutdown_request_with_code(SHUTDOWN_CAUSE_GUEST_SHUTDOWN,
|
||||||
|
code);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Memory access
|
* Memory access
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -113,6 +113,12 @@ void gdb_exit(int code)
|
||||||
gdb_put_packet(buf);
|
gdb_put_packet(buf);
|
||||||
gdbserver_state.allow_stop_reply = false;
|
gdbserver_state.allow_stop_reply = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void gdb_qemu_exit(int code)
|
||||||
|
{
|
||||||
|
exit(code);
|
||||||
}
|
}
|
||||||
|
|
||||||
int gdb_handlesig(CPUState *cpu, int sig)
|
int gdb_handlesig(CPUState *cpu, int sig)
|
||||||
|
|
|
@ -110,4 +110,13 @@ int use_gdb_syscalls(void);
|
||||||
*/
|
*/
|
||||||
void gdb_exit(int code);
|
void gdb_exit(int code);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* gdb_qemu_exit: ask qemu to exit
|
||||||
|
* @code: exit code reported
|
||||||
|
*
|
||||||
|
* This requests qemu to exit. This function is allowed to return as
|
||||||
|
* the exit request might be processed asynchronously by qemu backend.
|
||||||
|
*/
|
||||||
|
void gdb_qemu_exit(int code);
|
||||||
|
|
||||||
#endif /* _SYSCALLS_H_ */
|
#endif /* _SYSCALLS_H_ */
|
||||||
|
|
Loading…
Reference in New Issue