motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 09:43:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gdbstub: replace global gdb_has_xml with a function

Browse source 
Try and make the self reported global hack a little less hackish by
providing a query function instead. As gdb_has_xml was always set if
we negotiated XML we can now use the presence of ->target_xml as the
test instead.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230829161528.2707696-12-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2023-08-29 17:15:27 +01:00
parent 56e534bd11
commit d0e5fa849d
7 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gdbstub/gdbstub.c
View file

@ -75,8 +75,6 @@ void gdb_init_gdbserver_state(void)
gdbserver_state.sstep_flags &= gdbserver_state.supported_sstep_flags;
}
bool gdb_has_xml;
/* writes 2*len+1 bytes in buf */
void gdb_memtohex(GString *buf, const uint8_t *mem, int len)
{
@ -351,6 +349,11 @@ static CPUState *gdb_get_cpu(uint32_t pid, uint32_t tid)
}
}
bool gdb_has_xml(void)
{
return !!gdb_get_cpu_process(gdbserver_state.g_cpu)->target_xml;
}
static const char *get_feature_xml(const char *p, const char **newp,
GDBProcess *process)
{
@ -1084,7 +1087,7 @@ static void handle_set_reg(GArray *params, void *user_ctx)
{
int reg_size;
if (!gdb_has_xml) {
if (!gdb_get_cpu_process(gdbserver_state.g_cpu)->target_xml) {
gdb_put_packet("");
return;
}
@ -1105,7 +1108,7 @@ static void handle_get_reg(GArray *params, void *user_ctx)
{
int reg_size;
if (!gdb_has_xml) {
if (!gdb_get_cpu_process(gdbserver_state.g_cpu)->target_xml) {
gdb_put_packet("");
return;
}
@ -1572,7 +1575,6 @@ static void handle_query_xfer_features(GArray *params, void *user_ctx)
return;
}
gdb_has_xml = true;
p = get_param(params, 0)->data;
xml = get_feature_xml(p, &p, process);
if (!xml) {

1
gdbstub/internals.h
View file

@ -33,6 +33,7 @@ typedef struct GDBProcess {
uint32_t pid;
bool attached;
/* If gdb sends qXfer:features:read:target.xml this will be populated */
char *target_xml;
} GDBProcess;

1
gdbstub/softmmu.c
View file

@ -97,7 +97,6 @@ static void gdb_chr_event(void *opaque, QEMUChrEvent event)
vm_stop(RUN_STATE_PAUSED);
replay_gdb_attached();
gdb_has_xml = false;
break;
default:
break;

1
gdbstub/user.c
View file

@ -198,7 +198,6 @@ static void gdb_accept_init(int fd)
gdbserver_state.c_cpu = gdb_first_attached_cpu();
gdbserver_state.g_cpu = gdbserver_state.c_cpu;
gdbserver_user_state.fd = fd;
gdb_has_xml = false;
}
static bool gdb_accept_socket(int gdb_fd)