[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/8] trace: enable tracing in qemu-img
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 7/8] trace: enable tracing in qemu-img |
Date: |
Tue, 28 Jun 2016 22:27:29 +0100 |
From: "Denis V. Lunev" <address@hidden>
The command will work this way:
qemu-img --trace "qcow2*" create -f qcow2 1.img 64G
[Quote "qcow2*" to protect against shell globbing as suggested by Eric
Blake <address@hidden>.
--Stefan]
Signed-off-by: Denis V. Lunev <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Suggested by: Daniel P. Berrange <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
CC: Paolo Bonzini <address@hidden>
CC: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
Makefile | 2 +-
qemu-img.c | 19 ++++++++++++++++++-
qemu-img.texi | 3 +++
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 2d31af0..9d12dc6 100644
--- a/Makefile
+++ b/Makefile
@@ -566,7 +566,7 @@ qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi
qemu-monitor-info.texi
" GEN $@")
qemu.1: qemu-option-trace.texi
-qemu-img.1: qemu-img.texi qemu-img-cmds.texi
+qemu-img.1: qemu-img.texi qemu-option-trace.texi qemu-img-cmds.texi
$(call quiet-command, \
perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu-img.pod && \
$(POD2MAN) --section=1 --center=" " --release=" " qemu-img.pod > $@, \
diff --git a/qemu-img.c b/qemu-img.c
index 2194c2d..3322a1e 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -32,6 +32,7 @@
#include "qemu/config-file.h"
#include "qemu/option.h"
#include "qemu/error-report.h"
+#include "qemu/log.h"
#include "qom/object_interfaces.h"
#include "sysemu/sysemu.h"
#include "sysemu/block-backend.h"
@@ -39,6 +40,7 @@
#include "block/blockjob.h"
#include "block/qapi.h"
#include "crypto/init.h"
+#include "trace/control.h"
#include <getopt.h>
#define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \
@@ -96,6 +98,8 @@ static void QEMU_NORETURN help(void)
"\n"
" '-h', '--help' display this help and exit\n"
" '-V', '--version' output version information and exit\n"
+ " '-T', '--trace'
[[enable=]<pattern>][,events=<file>][,file=<file>]\n"
+ " specify tracing options\n"
"\n"
"Command syntax:\n"
#define DEF(option, callback, arg_string) \
@@ -3806,10 +3810,12 @@ int main(int argc, char **argv)
const img_cmd_t *cmd;
const char *cmdname;
Error *local_error = NULL;
+ char *trace_file = NULL;
int c;
static const struct option long_options[] = {
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
+ {"trace", required_argument, NULL, 'T'},
{0, 0, 0, 0}
};
@@ -3835,8 +3841,9 @@ int main(int argc, char **argv)
qemu_add_opts(&qemu_object_opts);
qemu_add_opts(&qemu_source_opts);
+ qemu_add_opts(&qemu_trace_opts);
- while ((c = getopt_long(argc, argv, "+hV", long_options, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "+hVT:", long_options, NULL)) != -1) {
switch (c) {
case 'h':
help();
@@ -3844,6 +3851,10 @@ int main(int argc, char **argv)
case 'V':
printf(QEMU_IMG_VERSION);
return 0;
+ case 'T':
+ g_free(trace_file);
+ trace_file = trace_opt_parse(optarg);
+ break;
}
}
@@ -3857,6 +3868,12 @@ int main(int argc, char **argv)
argv += optind;
optind = 1;
+ if (!trace_init_backends()) {
+ exit(1);
+ }
+ trace_init_file(trace_file);
+ qemu_set_log(LOG_TRACE);
+
/* find the command */
for (cmd = img_cmds; cmd->name != NULL; cmd++) {
if (!strcmp(cmdname, cmd->name)) {
diff --git a/qemu-img.texi b/qemu-img.texi
index f1b874d..449a19c 100644
--- a/qemu-img.texi
+++ b/qemu-img.texi
@@ -22,6 +22,9 @@ Standard options:
Display this help and exit
@item -V, --version
Display version information and exit
address@hidden -T, --trace address@hidden,address@hidden,address@hidden
address@hidden --trace
address@hidden qemu-option-trace.texi
@end table
The following commands are supported:
--
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, 2016/06/28
- [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 <=
- [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