[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/2 -v2] gdbstub: Rework configuration via command l
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 2/2 -v2] gdbstub: Rework configuration via command line and monitor |
Date: |
Sat, 21 Mar 2009 10:48:54 +0100 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
Introduce a more powerful gdbstub configuration (system emulation olny)
via new switch '-gdb dev'. Keep '-s' as shorthand for '-gdb tcp::1234'.
Use the same syntax also for the corresponding monitor command
'gdbserver'. Its default also remains to listen on port 1234.
Changes in v2:
- Support for pipe-based like to gdb (target remote | qemu -gdb stdio)
- Properly update the qemu-doc
Signed-off-by: Jan Kiszka <address@hidden>
---
gdbstub.c | 41 +++++++++++++++++++++++++++--------------
monitor.c | 19 ++++++++++---------
qemu-doc.texi | 12 +++++++++++-
vl.c | 33 ++++++++++++---------------------
4 files changed, 60 insertions(+), 45 deletions(-)
diff --git a/gdbstub.c b/gdbstub.c
index e8ceaae..cea375f 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -2395,27 +2395,40 @@ static int gdb_monitor_write(CharDriverState *chr,
const uint8_t *buf, int len)
return len;
}
-int gdbserver_start(const char *port)
+#ifndef _WIN32
+static void gdb_sigterm_handler(int signal)
+{
+ if (vm_running)
+ vm_stop(EXCP_INTERRUPT);
+}
+#endif
+
+int gdbserver_start(const char *device)
{
GDBState *s;
- char gdbstub_port_name[128];
- int port_num;
- char *p;
+ char gdbstub_device_name[128];
CharDriverState *chr = NULL;
CharDriverState *mon_chr;
- if (!port || !*port)
- return -1;
- if (strcmp(port, "none") != 0) {
- port_num = strtol(port, &p, 10);
- if (*p == 0) {
- /* A numeric value is interpreted as a port number. */
- snprintf(gdbstub_port_name, sizeof(gdbstub_port_name),
- "tcp::%d,nowait,nodelay,server", port_num);
- port = gdbstub_port_name;
+ if (!device)
+ return -1;
+ if (strcmp(device, "none") != 0) {
+ if (strstart(device, "tcp:", NULL)) {
+ /* enforce required TCP attributes */
+ snprintf(gdbstub_device_name, sizeof(gdbstub_device_name),
+ "%s,nowait,nodelay,server", device);
+ device = gdbstub_device_name;
}
+#ifndef _WIN32
+ else if (strcmp(device, "stdio") == 0) {
+ struct sigaction act;
- chr = qemu_chr_open("gdb", port, NULL);
+ memset(&act, 0, sizeof(act));
+ act.sa_handler = gdb_sigterm_handler;
+ sigaction(SIGINT, &act, NULL);
+ }
+#endif
+ chr = qemu_chr_open("gdb", device, NULL);
if (!chr)
return -1;
diff --git a/monitor.c b/monitor.c
index c6fe968..75c8663 100644
--- a/monitor.c
+++ b/monitor.c
@@ -570,17 +570,18 @@ static void encrypted_bdrv_it(void *opaque,
BlockDriverState *bs)
}
#ifdef CONFIG_GDBSTUB
-static void do_gdbserver(Monitor *mon, const char *port)
-{
- if (!port)
- port = DEFAULT_GDBSTUB_PORT;
- if (gdbserver_start(port) < 0) {
- monitor_printf(mon, "Could not open gdbserver socket on port '%s'\n",
- port);
- } else if (strcmp(port, "none") == 0) {
+static void do_gdbserver(Monitor *mon, const char *device)
+{
+ if (!device)
+ device = "tcp::" DEFAULT_GDBSTUB_PORT;
+ if (gdbserver_start(device) < 0) {
+ monitor_printf(mon, "Could not open gdbserver on device '%s'\n",
+ device);
+ } else if (strcmp(device, "none") == 0) {
monitor_printf(mon, "Disabled gdbserver\n");
} else {
- monitor_printf(mon, "Waiting gdb connection on port '%s'\n", port);
+ monitor_printf(mon, "Waiting for gdb connection on device '%s'\n",
+ device);
}
}
#endif
diff --git a/qemu-doc.texi b/qemu-doc.texi
index 8efc943..d70d7be 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -1097,8 +1097,18 @@ from a script.
@item -S
Do not start CPU at startup (you must type 'c' in the monitor).
address@hidden -gdb @var{dev}
+
+Wait for gdb connection on device @var{dev} (@pxref{gdb_usage}). Typical
+connections will likely be TCP-based, but also unix sockets or even stdio
+are reasonable use case. The latter is allowing to start qemu from within
+gdb and establish the connection via a pipe:
+
+(gdb) target remote | exec qemu -gdb stdio ...
+
@item -s
-Wait gdb connection to port 1234 (@pxref{gdb_usage}).
+Shorthand for -gdb tcp::1234, i.e. open a gdbserver on TCP port 1234
+(@pxref{gdb_usage}).
@item -p @var{port}
Change gdb connection port. @var{port} can be either a decimal number
diff --git a/vl.c b/vl.c
index abc7f5d..6e31a00 100644
--- a/vl.c
+++ b/vl.c
@@ -4073,8 +4073,8 @@ static void help(int exitcode)
"-monitor dev redirect the monitor to char device 'dev'\n"
"-pidfile file write PID to 'file'\n"
"-S freeze CPU at startup (use 'c' to start
execution)\n"
- "-s wait gdb connection to port\n"
- "-p port set gdb connection port [default=%s]\n"
+ "-gdb dev wait for gdb connection on 'dev'\n"
+ "-s shorthand for -gdb tcp::%s\n"
"-d item1,... output log to %s (use -d ? for a list of log
items)\n"
"-hdachs c,h,s[,t]\n"
" force hard disk 0 physical geometry and the
optional BIOS\n"
@@ -4214,7 +4214,7 @@ enum {
QEMU_OPTION_pidfile,
QEMU_OPTION_S,
QEMU_OPTION_s,
- QEMU_OPTION_p,
+ QEMU_OPTION_gdb,
QEMU_OPTION_d,
QEMU_OPTION_hdachs,
QEMU_OPTION_L,
@@ -4336,7 +4336,7 @@ static const QEMUOption qemu_options[] = {
{ "pidfile", HAS_ARG, QEMU_OPTION_pidfile },
{ "S", 0, QEMU_OPTION_S },
{ "s", 0, QEMU_OPTION_s },
- { "p", HAS_ARG, QEMU_OPTION_p },
+ { "gdb", HAS_ARG, QEMU_OPTION_gdb },
{ "d", HAS_ARG, QEMU_OPTION_d },
{ "hdachs", HAS_ARG, QEMU_OPTION_hdachs },
{ "L", HAS_ARG, QEMU_OPTION_L },
@@ -4607,8 +4607,7 @@ static void termsig_setup(void)
int main(int argc, char **argv, char **envp)
{
#ifdef CONFIG_GDBSTUB
- int use_gdbstub;
- const char *gdbstub_port;
+ const char *gdbstub_dev = NULL;
#endif
uint32_t boot_devices_bitmap = 0;
int i;
@@ -4687,10 +4686,6 @@ int main(int argc, char **argv, char **envp)
initrd_filename = NULL;
ram_size = 0;
vga_ram_size = VGA_RAM_SIZE;
-#ifdef CONFIG_GDBSTUB
- use_gdbstub = 0;
- gdbstub_port = DEFAULT_GDBSTUB_PORT;
-#endif
snapshot = 0;
nographic = 0;
curses = 0;
@@ -5023,10 +5018,10 @@ int main(int argc, char **argv, char **envp)
break;
#ifdef CONFIG_GDBSTUB
case QEMU_OPTION_s:
- use_gdbstub = 1;
+ gdbstub_dev = "tcp::" DEFAULT_GDBSTUB_PORT;
break;
- case QEMU_OPTION_p:
- gdbstub_port = optarg;
+ case QEMU_OPTION_gdb:
+ gdbstub_dev = optarg;
break;
#endif
case QEMU_OPTION_L:
@@ -5732,14 +5727,10 @@ int main(int argc, char **argv, char **envp)
}
#ifdef CONFIG_GDBSTUB
- if (use_gdbstub) {
- /* XXX: use standard host:port notation and modify options
- accordingly. */
- if (gdbserver_start(gdbstub_port) < 0) {
- fprintf(stderr, "qemu: could not open gdbstub device on port
'%s'\n",
- gdbstub_port);
- exit(1);
- }
+ if (gdbstub_dev && gdbserver_start(gdbstub_dev) < 0) {
+ fprintf(stderr, "qemu: could not open gdbserver on device '%s'\n",
+ gdbstub_dev);
+ exit(1);
}
#endif