[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 5/6] gdbstub: drop gdbserver_cleanup in favour of gdb_exit
From: |
Alex Bennée |
Subject: |
[PATCH v1 5/6] gdbstub: drop gdbserver_cleanup in favour of gdb_exit |
Date: |
Mon, 14 Dec 2020 15:30:11 +0000 |
Despite it's name it didn't actually clean-up so let us document
gdb_exit() better and use that.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
include/exec/gdbstub.h | 14 +++++++++++---
gdbstub.c | 7 -------
softmmu/vl.c | 2 +-
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
index 492db0f512..ff0b7bc45e 100644
--- a/include/exec/gdbstub.h
+++ b/include/exec/gdbstub.h
@@ -46,7 +46,17 @@ void gdb_do_syscall(gdb_syscall_complete_cb cb, const char
*fmt, ...);
void gdb_do_syscallv(gdb_syscall_complete_cb cb, const char *fmt, va_list va);
int use_gdb_syscalls(void);
void gdb_set_stop_cpu(CPUState *cpu);
-void gdb_exit(int);
+
+/**
+ * gdb_exit: exit gdb session, reporting inferior status
+ * @code: exit code reported
+ *
+ * This closes the session and sends a final packet to GDB reporting
+ * the exit status of the program. It also cleans up any connections
+ * detritus before returning.
+ */
+void gdb_exit(int code);
+
#ifdef CONFIG_USER_ONLY
/**
* gdb_handlesig: yield control to gdb
@@ -187,8 +197,6 @@ static inline uint8_t * gdb_get_reg_ptr(GByteArray *buf,
int len)
*/
int gdbserver_start(const char *port_or_device);
-void gdbserver_cleanup(void);
-
/**
* gdb_has_xml:
* This is an ugly hack to cope with both new and old gdb.
diff --git a/gdbstub.c b/gdbstub.c
index f6566c7b82..7172f063a1 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -3547,13 +3547,6 @@ int gdbserver_start(const char *device)
return 0;
}
-void gdbserver_cleanup(void)
-{
- if (gdbserver_state.init) {
- put_packet("W00");
- }
-}
-
static void register_types(void)
{
type_register_static(&char_gdb_type_info);
diff --git a/softmmu/vl.c b/softmmu/vl.c
index e6e0ad5a92..0694a1d602 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -4509,7 +4509,7 @@ void qemu_init(int argc, char **argv, char **envp)
void qemu_cleanup(void)
{
- gdbserver_cleanup();
+ gdb_exit(0);
/*
* cleaning up the migration object cancels any existing migration
--
2.20.1
- [PATCH v1 2/6] configure: gate our use of GDB to 8.3.1 or above, (continued)
- [PATCH v1 3/6] gdbstub: add support to Xfer:auxv:read: packet, Alex Bennée, 2020/12/14
- [PATCH v1 4/6] gdbstub: drop CPUEnv from gdb_exit(), Alex Bennée, 2020/12/14
- [PATCH v1 6/6] gdbstub: ensure we clean-up when terminated, Alex Bennée, 2020/12/14
- [PATCH v1 5/6] gdbstub: drop gdbserver_cleanup in favour of gdb_exit,
Alex Bennée <=
- [PATCH v1 1/6] test/guest-debug: echo QEMU command as well, Alex Bennée, 2020/12/14