From patchwork Fri Jul 15 17:08:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Vilanova?= X-Patchwork-Id: 9232329 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4A5866075D for ; Fri, 15 Jul 2016 17:09:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B7EA27CCB for ; Fri, 15 Jul 2016 17:09:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3046827FB6; Fri, 15 Jul 2016 17:09:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B89A927CCB for ; Fri, 15 Jul 2016 17:09:21 +0000 (UTC) Received: from localhost ([::1]:33914 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bO6c4-0007Zz-SO for patchwork-qemu-devel@patchwork.kernel.org; Fri, 15 Jul 2016 13:09:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bO6bb-0007XP-LI for qemu-devel@nongnu.org; Fri, 15 Jul 2016 13:08:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bO6bX-0004zF-F6 for qemu-devel@nongnu.org; Fri, 15 Jul 2016 13:08:50 -0400 Received: from roura.ac.upc.edu ([147.83.33.10]:36870 helo=roura.ac.upc.es) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bO6bX-0004yz-38 for qemu-devel@nongnu.org; Fri, 15 Jul 2016 13:08:47 -0400 Received: from gw-2.ac.upc.es (gw-2.ac.upc.es [147.83.30.8]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id u6FH8cvr020064; Fri, 15 Jul 2016 19:08:38 +0200 Received: from localhost (unknown [84.88.51.85]) by gw-2.ac.upc.es (Postfix) with ESMTPSA id 2545CA59; Fri, 15 Jul 2016 19:08:38 +0200 (CEST) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Fri, 15 Jul 2016 19:08:38 +0200 Message-Id: <146860251784.30668.17339867835129075077.stgit@fimbulvetr.bsc.es> X-Mailer: git-send-email 2.8.1 In-Reply-To: <146860251243.30668.5165413432802957512.stgit@fimbulvetr.bsc.es> References: <146860251243.30668.5165413432802957512.stgit@fimbulvetr.bsc.es> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id u6FH8cvr020064 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 147.83.33.10 Subject: [Qemu-devel] [PATCH v3 1/2] trace: [linux-user] Commandline arguments to control tracing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Stefan Hajnoczi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Lluís Vilanova --- linux-user/main.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/linux-user/main.c b/linux-user/main.c index 617a179..53be5dd 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -24,6 +24,7 @@ #include "qapi/error.h" #include "qemu.h" #include "qemu/path.h" +#include "qemu/config-file.h" #include "qemu/cutils.h" #include "qemu/help_option.h" #include "cpu.h" @@ -33,6 +34,8 @@ #include "qemu/envlist.h" #include "elf.h" #include "exec/log.h" +#include "trace/control.h" +#include "glib-compat.h" char *exec_path; @@ -4001,6 +4004,13 @@ static void handle_arg_version(const char *arg) exit(EXIT_SUCCESS); } +static const char * trace_file = NULL; +static void handle_arg_trace(const char *arg) +{ + g_free((char*)trace_file); + trace_file = trace_opt_parse(arg); +} + struct qemu_argument { const char *argv; const char *env; @@ -4048,6 +4058,8 @@ static const struct qemu_argument arg_table[] = { "", "log system calls"}, {"seed", "QEMU_RAND_SEED", true, handle_arg_randseed, "", "Seed for pseudo-random number generator"}, + {"trace", "QEMU_TRACE", true, handle_arg_trace, + "", "[[enable=]][,events=][,file=]"}, {"version", "QEMU_VERSION", false, handle_arg_version, "", "display version information and exit"}, {NULL, NULL, false, NULL, NULL, NULL} @@ -4237,8 +4249,15 @@ int main(int argc, char **argv, char **envp) srand(time(NULL)); + qemu_add_opts(&qemu_trace_opts); + optind = parse_args(argc, argv); + if (!trace_init_backends()) { + exit(1); + } + trace_init_file(trace_file); + /* Zero out regs */ memset(regs, 0, sizeof(struct target_pt_regs));