From patchwork Wed Aug 17 20:46:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryce Lanham X-Patchwork-Id: 110390 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4E75DB6F9A for ; Thu, 18 Aug 2011 08:13:31 +1000 (EST) Received: from localhost ([::1]:47489 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qtn2y-0006TZ-Ph for incoming@patchwork.ozlabs.org; Wed, 17 Aug 2011 16:49:08 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=MHTgtcdjfxYfdPMPIuwNEpIbKIWzV1vTGUs5xqLWw40=; b=Ht9PDTlfpUc+Y3vjGMT3adhXUZQzkyheVIX68ar3DbEyRs0YyK+wyNsA/ywEjjiksL i96sR+K0QtOX+5eFi1MwXJ1spxOBpUg97KusC+3MJiyVHr1Mk1pyHjcr4GQobFPGYqR2 vbcxfAsrn/h6lshNpo9/NID+IB+cRumdXvEYI= Received: by 10.236.77.136 with SMTP id d8mr4824223yhe.57.1313614106727; Wed, 17 Aug 2011 13:48:26 -0700 (PDT) Received: from localhost.localdomain (betelgeuse.cs.uchicago.edu [128.135.24.226]) by mx.google.com with ESMTPS id a29sm1237029yhj.59.2011.08.17.13.48.25 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 17 Aug 2011 13:48:25 -0700 (PDT) From: Bryce Lanham To: qemu-devel@nongnu.org Date: Wed, 17 Aug 2011 15:46:11 -0500 Message-Id: <1313614076-28878-7-git-send-email-blanham@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1313614076-28878-1-git-send-email-blanham@gmail.com> References: <1313614076-28878-1-git-send-email-blanham@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.160.173 Cc: Laurent Vivier Subject: [Qemu-devel] [PATCH 006/111] linux-user: define new environment variables X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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