From patchwork Thu May 31 19:37:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 162219 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9C56EB6FA9 for ; Fri, 1 Jun 2012 05:38:09 +1000 (EST) Received: from localhost ([::1]:34614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SaBCB-0006rn-Hw for incoming@patchwork.ozlabs.org; Thu, 31 May 2012 15:38:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SaBBg-0005Yv-5P for qemu-devel@nongnu.org; Thu, 31 May 2012 15:37:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SaBBd-0005n7-I1 for qemu-devel@nongnu.org; Thu, 31 May 2012 15:37:35 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:53966) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SaBBd-0005mj-94 for qemu-devel@nongnu.org; Thu, 31 May 2012 15:37:33 -0400 Received: by pbbro12 with SMTP id ro12so2099617pbb.4 for ; Thu, 31 May 2012 12:37:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=rvzX1vQgcDcOwZewMtK8M1x0+z9z2TWZzZP9BpJqbYg=; b=lSwQNwXMJsl5GGOeab/tw43Bz9RpKujnHyVJ3+zfTML3n6K9B3Uvb6t7uzeI+J0ZfG zqiEYc8me/yUt3niNegULd3nJigIWZc3WGs0rh6IVc+nIbqf5NCnt6QEM3vYBZp6M8mh r70+HybdStCAhr8HJD1o/yWxUEj642oQQrGv5Tfbi1mbRgdZ08RZDCPbzGJpchsD4OHc TyfHWGBkWgPqylCLH1+qlBG2Wsd+Ze/1/ypTYg5zQhOb3zm029nF3P/Cvl/iXxbhKjEV d3lHedtQdwXLg+iSqp/3dzz0mOzGdazHpEMPh5imWjix3xqvju6V6ef+OV0JHIf9eR+z jpKw== Received: by 10.68.225.170 with SMTP id rl10mr2229131pbc.13.1338493051370; Thu, 31 May 2012 12:37:31 -0700 (PDT) Received: from anchor.twiddle.home ([173.160.232.49]) by mx.google.com with ESMTPS id qx8sm29719pbc.28.2012.05.31.12.37.30 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 31 May 2012 12:37:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 31 May 2012 12:37:23 -0700 Message-Id: <1338493043-31206-3-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1338493043-31206-1-git-send-email-rth@twiddle.net> References: <1338493043-31206-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: Riku Voipio Subject: [Qemu-devel] [PATCH 2/2] linux-user: Add -stracefile to log strace elsewhere than stderr 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 Signed-off-by: Richard Henderson --- linux-user/main.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index f507a32..c728253 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -73,12 +73,14 @@ const char *qemu_uname_release = CONFIG_UNAME_RELEASE; by remapping the process stack directly at the right place */ unsigned long guest_stack_size = 8 * 1024 * 1024UL; +static FILE *strace_log_file; + void gemu_log(const char *fmt, ...) { va_list ap; va_start(ap, fmt); - vfprintf(stderr, fmt, ap); + vfprintf(strace_log_file, fmt, ap); va_end(ap); } @@ -3120,6 +3122,18 @@ static void handle_arg_strace(const char *arg) do_strace = 1; } +static void handle_arg_strace_filename(const char *arg) +{ + do_strace = 1; + if (strace_log_file != NULL) { + fclose(strace_log_file); + } + strace_log_file = fopen(arg, "w"); + if (strace_log_file != NULL) { + setbuf(strace_log_file, NULL); + } +} + static void handle_arg_version(const char *arg) { printf("qemu-" TARGET_ARCH " version " QEMU_VERSION QEMU_PKGVERSION @@ -3171,6 +3185,8 @@ struct qemu_argument arg_table[] = { "", "run in singlestep mode"}, {"strace", "QEMU_STRACE", false, handle_arg_strace, "", "log system calls"}, + {"stracefile", "QEMU_STRACEFILE", true, handle_arg_strace_filename, + "", "log system calls to file"}, {"version", "QEMU_VERSION", false, handle_arg_version, "", "display version information and exit"}, {NULL, NULL, false, NULL, NULL, NULL} @@ -3351,6 +3367,9 @@ int main(int argc, char **argv, char **envp) /* init debug */ cpu_set_log_filename(log_file); optind = parse_args(argc, argv); + if (do_strace && strace_log_file == NULL) { + strace_log_file = stderr; + } /* Zero out regs */ memset(regs, 0, sizeof(struct target_pt_regs)); @@ -3413,10 +3432,6 @@ int main(int argc, char **argv, char **envp) thread_env = env; - if (getenv("QEMU_STRACE")) { - do_strace = 1; - } - target_environ = envlist_to_environ(envlist, NULL); envlist_free(envlist);