OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

trace: enable tracing in qemu-io

Browse Source 
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 <den@openvz.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1466174654-30130-5-git-send-email-den@openvz.org
CC: Paolo Bonzini <pbonzini@redhat.com>
CC: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Denis V. Lunev 2016-06-17 17:44:11 +03:00 committed by Stefan Hajnoczi
parent e9e0bb2af2
commit e9a80859d6
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qemu-io.c
View File

@ -18,6 +18,7 @@
#include "qemu/option.h" #include "qemu/option.h"
#include "qemu/config-file.h" #include "qemu/config-file.h"
#include "qemu/readline.h" #include "qemu/readline.h"
#include "qemu/log.h"
#include "qapi/qmp/qstring.h" #include "qapi/qmp/qstring.h"
#include "qom/object_interfaces.h" #include "qom/object_interfaces.h"
#include "sysemu/block-backend.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" " -k, --native-aio use kernel AIO implementation (on Linux only)\n"
" -t, --cache=MODE use the given cache mode for the image\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" " -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" " -h, --help display this help and exit\n"
" -V, --version output version information and exit\n" " -V, --version output version information and exit\n"
"\n" "\n"
@ -458,6 +461,7 @@ int main(int argc, char **argv)
Error *local_error = NULL; Error *local_error = NULL;
QDict *opts = NULL; QDict *opts = NULL;
const char *format = NULL; const char *format = NULL;
char *trace_file = NULL;
#ifdef CONFIG_POSIX #ifdef CONFIG_POSIX
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
@ -470,6 +474,7 @@ int main(int argc, char **argv)
module_call_init(MODULE_INIT_QOM); module_call_init(MODULE_INIT_QOM);
qemu_add_opts(&qemu_object_opts); qemu_add_opts(&qemu_object_opts);
qemu_add_opts(&qemu_trace_opts);
bdrv_init(); bdrv_init();
while ((c = getopt_long(argc, argv, sopt, lopt, &opt_index)) != -1) { while ((c = getopt_long(argc, argv, sopt, lopt, &opt_index)) != -1) {
@ -509,9 +514,8 @@ int main(int argc, char **argv)
} }
break; break;
case 'T': case 'T':
if (!trace_init_backends()) { g_free(trace_file);
exit(1); /* error message will have been printed */ trace_file = trace_opt_parse(optarg);
}
break; break;
case 'V': case 'V':
printf("%s version %s\n", progname, QEMU_VERSION); printf("%s version %s\n", progname, QEMU_VERSION);
@ -557,6 +561,12 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
if (!trace_init_backends()) {
exit(1);
}
trace_init_file(trace_file);
qemu_set_log(LOG_TRACE);
/* initialize commands */ /* initialize commands */
qemuio_add_command(&quit_cmd); qemuio_add_command(&quit_cmd);
qemuio_add_command(&open_cmd); qemuio_add_command(&open_cmd);