motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gdbstub: define separate user/system structures

Browse source 
In preparation for moving user/softmmu specific bits from the main
gdbstub file we need to separate the connection details into a
user/softmmu state. As these will eventually be defined in their own
files we move them out of the common GDBState structure.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Message-Id: <20230302190846.2593720-6-alex.bennee@linaro.org>
Message-Id: <20230303025805.625589-6-richard.henderson@linaro.org>
This commit is contained in:
Alex Bennée 2023-03-02 18:57:41 -08:00
parent ad9e4585b3
commit 8e70c6f947
1 changed files with 53 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

94
gdbstub/gdbstub.c
View file

@ -341,6 +341,22 @@ enum RSState {
RS_CHKSUM1, RS_CHKSUM1,
RS_CHKSUM2, RS_CHKSUM2,
}; };
#ifdef CONFIG_USER_ONLY
typedef struct {
int fd;
char *socket_path;
int running_state;
} GDBUserState;
static GDBUserState gdbserver_user_state;
#else
typedef struct {
CharBackend chr;
Chardev *mon_chr;
} GDBSystemState;
static GDBSystemState gdbserver_system_state;
#endif
typedef struct GDBState { typedef struct GDBState {
bool init; /* have we been initialised? */ bool init; /* have we been initialised? */
CPUState *c_cpu; /* current CPU for step/continue ops */ CPUState *c_cpu; /* current CPU for step/continue ops */
@ -353,14 +369,6 @@ typedef struct GDBState {
int line_csum; /* checksum at the end of the packet */ int line_csum; /* checksum at the end of the packet */
GByteArray *last_packet; GByteArray *last_packet;
int signal; int signal;
#ifdef CONFIG_USER_ONLY
int fd;
char *socket_path;
int running_state;
#else
CharBackend chr;
Chardev *mon_chr;
#endif
bool multiprocess; bool multiprocess;
GDBProcess *processes; GDBProcess *processes;
int process_num; int process_num;
@ -412,15 +420,17 @@ static int get_char(void)
int ret; int ret;
for(;;) { for(;;) {
ret = recv(gdbserver_state.fd, &ch, 1, 0); ret = recv(gdbserver_user_state.fd, &ch, 1, 0);
if (ret < 0) { if (ret < 0) {
if (errno == ECONNRESET) if (errno == ECONNRESET) {
gdbserver_state.fd = -1; gdbserver_user_state.fd = -1;
if (errno != EINTR) }
if (errno != EINTR) {
return -1; return -1;
}
} else if (ret == 0) { } else if (ret == 0) {
close(gdbserver_state.fd); close(gdbserver_user_state.fd);
gdbserver_state.fd = -1; gdbserver_user_state.fd = -1;
return -1; return -1;
} else { } else {
break; break;
@ -479,7 +489,7 @@ static inline void gdb_continue(void)
{ {
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
gdbserver_state.running_state = 1; gdbserver_user_state.running_state = 1;
trace_gdbstub_op_continue(); trace_gdbstub_op_continue();
#else #else
if (!runstate_needs_reset()) { if (!runstate_needs_reset()) {
@ -508,7 +518,7 @@ static int gdb_continue_partial(char *newstates)
cpu_single_step(cpu, gdbserver_state.sstep_flags); cpu_single_step(cpu, gdbserver_state.sstep_flags);
} }
} }
gdbserver_state.running_state = 1; gdbserver_user_state.running_state = 1;
#else #else
int flag = 0; int flag = 0;
@ -560,7 +570,7 @@ static void put_buffer(const uint8_t *buf, int len)
int ret; int ret;
while (len > 0) { while (len > 0) {
ret = send(gdbserver_state.fd, buf, len, 0); ret = send(gdbserver_user_state.fd, buf, len, 0);
if (ret < 0) { if (ret < 0) {
if (errno != EINTR) if (errno != EINTR)
return; return;
@ -572,7 +582,7 @@ static void put_buffer(const uint8_t *buf, int len)
#else #else
/* XXX this blocks entire thread. Rewrite to use /* XXX this blocks entire thread. Rewrite to use
* qemu_chr_fe_write and background I/O callbacks */ * qemu_chr_fe_write and background I/O callbacks */
qemu_chr_fe_write_all(&gdbserver_state.chr, buf, len); qemu_chr_fe_write_all(&gdbserver_system_state.chr, buf, len);
#endif #endif
} }
@ -2094,7 +2104,8 @@ static void handle_query_rcmd(GArray *params, void *user_ctx)
len = len / 2; len = len / 2;
hextomem(gdbserver_state.mem_buf, get_param(params, 0)->data, len); hextomem(gdbserver_state.mem_buf, get_param(params, 0)->data, len);
g_byte_array_append(gdbserver_state.mem_buf, &zero, 1); g_byte_array_append(gdbserver_state.mem_buf, &zero, 1);
qemu_chr_be_write(gdbserver_state.mon_chr, gdbserver_state.mem_buf->data, qemu_chr_be_write(gdbserver_system_state.mon_chr,
gdbserver_state.mem_buf->data,
gdbserver_state.mem_buf->len); gdbserver_state.mem_buf->len);
put_packet("OK"); put_packet("OK");
} }
@ -3027,10 +3038,10 @@ void gdb_exit(int code)
return; return;
} }
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
if (gdbserver_state.socket_path) { if (gdbserver_user_state.socket_path) {
unlink(gdbserver_state.socket_path); unlink(gdbserver_user_state.socket_path);
} }
if (gdbserver_state.fd < 0) { if (gdbserver_user_state.fd < 0) {
return; return;
} }
#endif #endif
@ -3041,7 +3052,7 @@ void gdb_exit(int code)
put_packet(buf); put_packet(buf);
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
qemu_chr_fe_deinit(&gdbserver_state.chr, true); qemu_chr_fe_deinit(&gdbserver_system_state.chr, true);
#endif #endif
} }
@ -3077,7 +3088,7 @@ gdb_handlesig(CPUState *cpu, int sig)
char buf[256]; char buf[256];
int n; int n;
if (!gdbserver_state.init || gdbserver_state.fd < 0) { if (!gdbserver_state.init || gdbserver_user_state.fd < 0) {
return sig; return sig;
} }
@ -3095,15 +3106,15 @@ gdb_handlesig(CPUState *cpu, int sig)
} }
/* put_packet() might have detected that the peer terminated the /* put_packet() might have detected that the peer terminated the
connection. */ connection. */
if (gdbserver_state.fd < 0) { if (gdbserver_user_state.fd < 0) {
return sig; return sig;
} }
sig = 0; sig = 0;
gdbserver_state.state = RS_IDLE; gdbserver_state.state = RS_IDLE;
gdbserver_state.running_state = 0; gdbserver_user_state.running_state = 0;
while (gdbserver_state.running_state == 0) { while (gdbserver_user_state.running_state == 0) {
n = read(gdbserver_state.fd, buf, 256); n = read(gdbserver_user_state.fd, buf, 256);
if (n > 0) { if (n > 0) {
int i; int i;
@ -3114,9 +3125,9 @@ gdb_handlesig(CPUState *cpu, int sig)
/* XXX: Connection closed. Should probably wait for another /* XXX: Connection closed. Should probably wait for another
connection before continuing. */ connection before continuing. */
if (n == 0) { if (n == 0) {
close(gdbserver_state.fd); close(gdbserver_user_state.fd);
} }
gdbserver_state.fd = -1; gdbserver_user_state.fd = -1;
return sig; return sig;
} }
} }
@ -3130,7 +3141,7 @@ void gdb_signalled(CPUArchState *env, int sig)
{ {
char buf[4]; char buf[4];
if (!gdbserver_state.init || gdbserver_state.fd < 0) { if (!gdbserver_state.init || gdbserver_user_state.fd < 0) {
return; return;
} }
@ -3145,7 +3156,7 @@ static void gdb_accept_init(int fd)
gdbserver_state.processes[0].attached = true; gdbserver_state.processes[0].attached = true;
gdbserver_state.c_cpu = gdb_first_attached_cpu(); gdbserver_state.c_cpu = gdb_first_attached_cpu();
gdbserver_state.g_cpu = gdbserver_state.c_cpu; gdbserver_state.g_cpu = gdbserver_state.c_cpu;
gdbserver_state.fd = fd; gdbserver_user_state.fd = fd;
gdb_has_xml = false; gdb_has_xml = false;
} }
@ -3277,7 +3288,7 @@ int gdbserver_start(const char *port_or_path)
if (port > 0 && gdb_accept_tcp(gdb_fd)) { if (port > 0 && gdb_accept_tcp(gdb_fd)) {
return 0; return 0;
} else if (gdb_accept_socket(gdb_fd)) { } else if (gdb_accept_socket(gdb_fd)) {
gdbserver_state.socket_path = g_strdup(port_or_path); gdbserver_user_state.socket_path = g_strdup(port_or_path);
return 0; return 0;
} }
@ -3289,11 +3300,11 @@ int gdbserver_start(const char *port_or_path)
/* Disable gdb stub for child processes. */ /* Disable gdb stub for child processes. */
void gdbserver_fork(CPUState *cpu) void gdbserver_fork(CPUState *cpu)
{ {
if (!gdbserver_state.init || gdbserver_state.fd < 0) { if (!gdbserver_state.init || gdbserver_user_state.fd < 0) {
return; return;
} }
close(gdbserver_state.fd); close(gdbserver_user_state.fd);
gdbserver_state.fd = -1; gdbserver_user_state.fd = -1;
cpu_breakpoint_remove_all(cpu, BP_GDB); cpu_breakpoint_remove_all(cpu, BP_GDB);
cpu_watchpoint_remove_all(cpu, BP_GDB); cpu_watchpoint_remove_all(cpu, BP_GDB);
} }
@ -3487,21 +3498,22 @@ int gdbserver_start(const char *device)
NULL, NULL, &error_abort); NULL, NULL, &error_abort);
monitor_init_hmp(mon_chr, false, &error_abort); monitor_init_hmp(mon_chr, false, &error_abort);
} else { } else {
qemu_chr_fe_deinit(&gdbserver_state.chr, true); qemu_chr_fe_deinit(&gdbserver_system_state.chr, true);
mon_chr = gdbserver_state.mon_chr; mon_chr = gdbserver_system_state.mon_chr;
reset_gdbserver_state(); reset_gdbserver_state();
} }
create_processes(&gdbserver_state); create_processes(&gdbserver_state);
if (chr) { if (chr) {
qemu_chr_fe_init(&gdbserver_state.chr, chr, &error_abort); qemu_chr_fe_init(&gdbserver_system_state.chr, chr, &error_abort);
qemu_chr_fe_set_handlers(&gdbserver_state.chr, gdb_chr_can_receive, qemu_chr_fe_set_handlers(&gdbserver_system_state.chr,
gdb_chr_can_receive,
gdb_chr_receive, gdb_chr_event, gdb_chr_receive, gdb_chr_event,
NULL, &gdbserver_state, NULL, true); NULL, &gdbserver_state, NULL, true);
} }
gdbserver_state.state = chr ? RS_IDLE : RS_INACTIVE; gdbserver_state.state = chr ? RS_IDLE : RS_INACTIVE;
gdbserver_state.mon_chr = mon_chr; gdbserver_system_state.mon_chr = mon_chr;
gdbserver_state.current_syscall_cb = NULL; gdbserver_state.current_syscall_cb = NULL;
return 0; return 0;