From 6533dd6e111bb7929f8bf4fe06eadba1c70e6f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Vilanova?= Date: Fri, 15 Jul 2016 19:08:38 +0200 Subject: [PATCH] trace: [linux-user] Commandline arguments to control tracing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Changed const char *trace_file to char *trace_file since it's a heap-allocated string that needs to be freed. This type is also returned by trace_opt_parse() and used in vl.c. --Stefan] Signed-off-by: Lluís Vilanova Message-id: 146860251784.30668.17339867835129075077.stgit@fimbulvetr.bsc.es Signed-off-by: Stefan Hajnoczi --- linux-user/main.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/linux-user/main.c b/linux-user/main.c index 617a179f14..a053c22dee 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 char *trace_file; +static void handle_arg_trace(const char *arg) +{ + g_free(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));