[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/15] log: add "-d trace:PATTERN"
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 15/15] log: add "-d trace:PATTERN" |
Date: |
Tue, 10 Nov 2015 13:31:48 +0000 |
From: Paolo Bonzini <address@hidden>
This is a bit easier to use than "-trace" if you are also enabling
other kinds of logging. It is also more discoverable for experienced
QEMU users, and accessible from user-mode emulators.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
util/log.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/util/log.c b/util/log.c
index 5cc71eb..c5f24ce 100644
--- a/util/log.c
+++ b/util/log.c
@@ -19,6 +19,7 @@
#include "qemu-common.h"
#include "qemu/log.h"
+#include "trace/control.h"
static char *logfilename;
FILE *qemu_logfile;
@@ -152,6 +153,11 @@ int qemu_str_to_log_mask(const char *str)
for (item = qemu_log_items; item->mask != 0; item++) {
mask |= item->mask;
}
+#ifdef CONFIG_TRACE_LOG
+ } else if (strncmp(p, "trace:", 6) == 0 && p + 6 != p1) {
+ trace_enable_events(p + 6);
+ mask |= LOG_TRACE;
+#endif
} else {
for (item = qemu_log_items; item->mask != 0; item++) {
if (cmp1(p, p1 - p, item->name)) {
@@ -159,9 +165,9 @@ int qemu_str_to_log_mask(const char *str)
}
}
return 0;
+ found:
+ mask |= item->mask;
}
- found:
- mask |= item->mask;
if (*p1 != ',') {
break;
}
@@ -175,6 +181,10 @@ void qemu_print_log_usage(FILE *f)
const QEMULogItem *item;
fprintf(f, "Log items (comma separated):\n");
for (item = qemu_log_items; item->mask != 0; item++) {
- fprintf(f, "%-10s %s\n", item->name, item->help);
+ fprintf(f, "%-15s %s\n", item->name, item->help);
}
+#ifdef CONFIG_TRACE_LOG
+ fprintf(f, "trace:PATTERN enable trace events\n");
+ fprintf(f, "\nUse \"-d trace:help\" to get a list of trace events.\n\n");
+#endif
}
--
2.5.0
- [Qemu-devel] [PULL 06/15] trace: split trace_init_events out of trace_init_backends, (continued)
- [Qemu-devel] [PULL 06/15] trace: split trace_init_events out of trace_init_backends, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 08/15] trace: no need to call trace_backend_init in different branches now, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 09/15] trace: add "-trace enable=...", Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 10/15] trace: add "-trace help", Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 11/15] log: do not unnecessarily include qom/cpu.h, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 12/15] log: move qemu-log.c into util/ directory, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 14/15] trace: switch default backend to "log", Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 13/15] trace: convert stderr backend to log, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 15/15] log: add "-d trace:PATTERN",
Stefan Hajnoczi <=
- Re: [Qemu-devel] [PULL 00/15] Tracing patches, Peter Maydell, 2015/11/10