From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:46805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qtn2K-0004pg-GJ for qemu-devel@nongnu.org; Wed, 17 Aug 2011 16:48:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qtn2J-0006di-6V for qemu-devel@nongnu.org; Wed, 17 Aug 2011 16:48:28 -0400 Received: from mail-gy0-f173.google.com ([209.85.160.173]:61488) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qtn2J-0006dO-0v for qemu-devel@nongnu.org; Wed, 17 Aug 2011 16:48:27 -0400 Received: by mail-gy0-f173.google.com with SMTP id 12so1229686gyd.4 for ; Wed, 17 Aug 2011 13:48:26 -0700 (PDT) From: Bryce Lanham Date: Wed, 17 Aug 2011 15:46:11 -0500 Message-Id: <1313614076-28878-7-git-send-email-blanham@gmail.com> In-Reply-To: <1313614076-28878-1-git-send-email-blanham@gmail.com> References: <1313614076-28878-1-git-send-email-blanham@gmail.com> Subject: [Qemu-devel] [PATCH 006/111] linux-user: define new environment variables List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laurent Vivier From: Laurent Vivier QEMU_GDB=port allows to define gdb server port to wait on. QEMU_DEBUG=options allows to activate log file (like -d options) Signed-off-by: Laurent Vivier --- linux-user/main.c | 14 +++++++++++--- qemu-doc.texi | 4 ++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 68b5681..62aa983 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2815,8 +2815,10 @@ static void usage(void) "-strace log system calls\n" "\n" "Environment variables:\n" - "QEMU_STRACE Print system calls and arguments similar to the\n" - " 'strace' program. Enable by setting to any value.\n" + "QEMU_STRACE Print system calls and arguments similar to the\n" + " 'strace' program. Enable by setting to any value.\n" + "QEMU_DEBUG=options Activate log. Use same options as '-d' options\n" + "QEMU_GDB=port Wait gdb connection to port\n" "You can use -E and -U options to set/unset environment variables\n" "for target process. It is possible to provide several variables\n" "by repeating the option. For example:\n" @@ -2872,7 +2874,7 @@ int main(int argc, char **argv, char **envp) const char *filename; const char *cpu_model; const char *log_file = DEBUG_LOGFILE; - const char *log_mask = NULL; + const char *log_mask = getenv("QEMU_DEBUG"); struct target_pt_regs regs1, *regs = ®s1; struct image_info info1, *info = &info1; struct linux_binprm bprm; @@ -2919,6 +2921,12 @@ int main(int argc, char **argv, char **envp) #if defined(cpudef_setup) cpudef_setup(); /* parse cpu definitions in target config file (TBD) */ #endif + if (getenv("QEMU_GDB")) { + gdbstub_port = atoi(getenv("QEMU_GDB")); + } + /* don't propagate QEMU_DEBUG and _GDB to children */ + unsetenv("QEMU_DEBUG"); + unsetenv("QEMU_GDB"); optind = 1; for(;;) { diff --git a/qemu-doc.texi b/qemu-doc.texi index 31199f6..2193463 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2293,6 +2293,10 @@ space emulator hasn't implemented ptrace). At the moment this is incomplete. All system calls that don't have a specific argument format are printed with information for six arguments. Many flag-style arguments don't have decoders and will show up as numbers. +@item QEMU_DEBUG=options +Activate log. Use same options as '-d' options. +@item QEMU_GDB=port +Wait gdb connection to port. @end table @node Other binaries -- 1.7.2.3