[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/8] trace: enable tracing in qemu-io
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 4/8] trace: enable tracing in qemu-io |
Date: |
Tue, 28 Jun 2016 22:27:26 +0100 |
From: "Denis V. Lunev" <address@hidden>
Moving trace_init_backends() into trace_opt_parse() is not possible. This
should be called after daemonize() in vl.c.
Signed-off-by: Denis V. Lunev <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
CC: Paolo Bonzini <address@hidden>
CC: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
qemu-io.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/qemu-io.c b/qemu-io.c
index d977a6e..db129ea 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -18,6 +18,7 @@
#include "qemu/option.h"
#include "qemu/config-file.h"
#include "qemu/readline.h"
+#include "qemu/log.h"
#include "qapi/qmp/qstring.h"
#include "qom/object_interfaces.h"
#include "sysemu/block-backend.h"
@@ -253,7 +254,9 @@ static void usage(const char *name)
" -k, --native-aio use kernel AIO implementation (on Linux only)\n"
" -t, --cache=MODE use the given cache mode for the image\n"
" -d, --discard=MODE use the given discard mode for the image\n"
-" -T, --trace FILE enable trace events listed in the given file\n"
+" -T, --trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n"
+" specify tracing options\n"
+" see qemu-img(1) man page for full description\n"
" -h, --help display this help and exit\n"
" -V, --version output version information and exit\n"
"\n"
@@ -458,6 +461,7 @@ int main(int argc, char **argv)
Error *local_error = NULL;
QDict *opts = NULL;
const char *format = NULL;
+ char *trace_file = NULL;
#ifdef CONFIG_POSIX
signal(SIGPIPE, SIG_IGN);
@@ -470,6 +474,7 @@ int main(int argc, char **argv)
module_call_init(MODULE_INIT_QOM);
qemu_add_opts(&qemu_object_opts);
+ qemu_add_opts(&qemu_trace_opts);
bdrv_init();
while ((c = getopt_long(argc, argv, sopt, lopt, &opt_index)) != -1) {
@@ -509,9 +514,8 @@ int main(int argc, char **argv)
}
break;
case 'T':
- if (!trace_init_backends()) {
- exit(1); /* error message will have been printed */
- }
+ g_free(trace_file);
+ trace_file = trace_opt_parse(optarg);
break;
case 'V':
printf("%s version %s\n", progname, QEMU_VERSION);
@@ -557,6 +561,12 @@ int main(int argc, char **argv)
exit(1);
}
+ if (!trace_init_backends()) {
+ exit(1);
+ }
+ trace_init_file(trace_file);
+ qemu_set_log(LOG_TRACE);
+
/* initialize commands */
qemuio_add_command(&quit_cmd);
qemuio_add_command(&open_cmd);
--
2.7.4
- [Qemu-devel] [PULL 0/8] Tracing patches, Stefan Hajnoczi, 2016/06/28
- [Qemu-devel] [PULL 1/8] doc: sync help description for --trace with man for qemu.1, Stefan Hajnoczi, 2016/06/28
- [Qemu-devel] [PULL 2/8] doc: move text describing --trace to specific .texi file, Stefan Hajnoczi, 2016/06/28
- [Qemu-devel] [PULL 3/8] trace: move qemu_trace_opts to trace/control.c, Stefan Hajnoczi, 2016/06/28
- [Qemu-devel] [PULL 4/8] trace: enable tracing in qemu-io,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 6/8] qemu-img: move common options parsing before commands processing, Stefan Hajnoczi, 2016/06/28
- [Qemu-devel] [PULL 5/8] trace: enable tracing in qemu-nbd, Stefan Hajnoczi, 2016/06/28
- [Qemu-devel] [PULL 7/8] trace: enable tracing in qemu-img, Stefan Hajnoczi, 2016/06/28
- [Qemu-devel] [PULL 8/8] trace: [*-user] Add events to trace guest syscalls in syscall emulation mode, Stefan Hajnoczi, 2016/06/28
- Re: [Qemu-devel] [PULL 0/8] Tracing patches, Peter Maydell, 2016/06/29