[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/9] trace: [linux-user] Commandline arguments to con
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 1/9] trace: [linux-user] Commandline arguments to control tracing |
Date: |
Mon, 18 Jul 2016 23:00:11 +0100 |
From: Lluís Vilanova <address@hidden>
[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 <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
linux-user/main.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/linux-user/main.c b/linux-user/main.c
index 617a179..a053c22 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=]<pattern>][,events=<file>][,file=<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));
--
2.7.4
- [Qemu-devel] [PULL 0/9] Tracing patches, Stefan Hajnoczi, 2016/07/18
- [Qemu-devel] [PULL 1/9] trace: [linux-user] Commandline arguments to control tracing,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 2/9] trace: [bsd-user] Commandline arguments to control tracing, Stefan Hajnoczi, 2016/07/18
- [Qemu-devel] [PULL 3/9] trace: Identify events with the 'vcpu' property, Stefan Hajnoczi, 2016/07/18
- [Qemu-devel] [PULL 5/9] trace: Cosmetic changes on fast-path tracing, Stefan Hajnoczi, 2016/07/18
- [Qemu-devel] [PULL 4/9] disas: Remove unused macro '_', Stefan Hajnoczi, 2016/07/18
- [Qemu-devel] [PULL 6/9] trace: Add per-vCPU tracing states for events with the 'vcpu' property, Stefan Hajnoczi, 2016/07/18
- [Qemu-devel] [PULL 7/9] trace: Conditionally trace events based on their per-vCPU state, Stefan Hajnoczi, 2016/07/18
- [Qemu-devel] [PULL 8/9] trace: Allow event name pattern in "info trace-events", Stefan Hajnoczi, 2016/07/18
- [Qemu-devel] [PULL 9/9] trace: Add QAPI/QMP interfaces to query and control per-vCPU tracing state, Stefan Hajnoczi, 2016/07/18
- Re: [Qemu-devel] [PULL 0/9] Tracing patches, Peter Maydell, 2016/07/19