[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 9/9] log: add "-d trace:PATTERN"
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 9/9] log: add "-d trace:PATTERN" |
Date: |
Sun, 25 Oct 2015 14:35:05 +0100 |
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>
---
qemu-log.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/qemu-log.c b/qemu-log.c
index 5c641a0..2bcef95 100644
--- a/qemu-log.c
+++ b/qemu-log.c
@@ -19,6 +19,7 @@
#include "qemu-common.h"
#include "qemu/log.h"
+#include "trace/control.h"
static char *logfilename;
FILE *qemu_logfile;
@@ -154,6 +155,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)) {
@@ -161,9 +167,9 @@ int qemu_str_to_log_mask(const char *str)
}
}
return 0;
+ found:
+ mask |= item->mask;
}
- found:
- mask |= item->mask;
if (*p1 != ',') {
break;
}
@@ -177,6 +183,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] [PATCH 0/9] simplify usage of tracepoints, and connect them to logging, Paolo Bonzini, 2015/10/25
- [Qemu-devel] [PATCH 1/9] trace: fix documentation, Paolo Bonzini, 2015/10/25
- [Qemu-devel] [PATCH 2/9] trace: split trace_init_events out of trace_init_backends, Paolo Bonzini, 2015/10/25
- [Qemu-devel] [PATCH 3/9] trace: split trace_init_file out of trace_init_backends, Paolo Bonzini, 2015/10/25
- [Qemu-devel] [PATCH 5/9] trace: add "-trace help", Paolo Bonzini, 2015/10/25
- [Qemu-devel] [PATCH 4/9] trace: add "-trace enable=...", Paolo Bonzini, 2015/10/25
- [Qemu-devel] [PATCH 6/9] log: do not unnecessarily include qom/cpu.h, Paolo Bonzini, 2015/10/25
- [Qemu-devel] [PATCH 7/9] trace: convert stderr backend to log, Paolo Bonzini, 2015/10/25
- [Qemu-devel] [PATCH 8/9] trace: switch default backend to "log", Paolo Bonzini, 2015/10/25
- [Qemu-devel] [PATCH 9/9] log: add "-d trace:PATTERN",
Paolo Bonzini <=
- Re: [Qemu-devel] [PATCH 0/9] simplify usage of tracepoints, and connect them to logging, Peter Maydell, 2015/10/25
- Re: [Qemu-devel] [PATCH 0/9] simplify usage of tracepoints, and connect them to logging, Christian Borntraeger, 2015/10/25
- Re: [Qemu-devel] [PATCH 0/9] simplify usage of tracepoints, and connect them to logging, Christian Borntraeger, 2015/10/25