[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/11] log: add "-d trace:PATTERN"
From: |
Denis V. Lunev |
Subject: |
[Qemu-devel] [PATCH 11/11] log: add "-d trace:PATTERN" |
Date: |
Thu, 7 Jan 2016 16:55:32 +0300 |
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>
---
util/log.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/util/log.c b/util/log.c
index 37185a5..46c88c9 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;
@@ -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 v4 00/11] simplify usage of tracepoints, and connect them to logging, Denis V. Lunev, 2016/01/07
- [Qemu-devel] [PATCH 01/11] trace: fix documentation, Denis V. Lunev, 2016/01/07
- [Qemu-devel] [PATCH 04/11] trace: no need to call trace_backend_init in different branches now, Denis V. Lunev, 2016/01/07
- [Qemu-devel] [PATCH 05/11] trace: add "-trace enable=...", Denis V. Lunev, 2016/01/07
- [Qemu-devel] [PATCH 06/11] trace: add "-trace help", Denis V. Lunev, 2016/01/07
- [Qemu-devel] [PATCH 08/11] log: move qemu-log.c into util/ directory, Denis V. Lunev, 2016/01/07
- [Qemu-devel] [PATCH 03/11] trace: split trace_init_file out of trace_init_backends, Denis V. Lunev, 2016/01/07
- [Qemu-devel] [PATCH 02/11] trace: split trace_init_events out of trace_init_backends, Denis V. Lunev, 2016/01/07
- [Qemu-devel] [PATCH 10/11] trace: switch default backend to "log", Denis V. Lunev, 2016/01/07
- [Qemu-devel] [PATCH 11/11] log: add "-d trace:PATTERN",
Denis V. Lunev <=
- [Qemu-devel] [PATCH 09/11] trace: convert stderr backend to log, Denis V. Lunev, 2016/01/07
- [Qemu-devel] [PATCH 07/11] log: do not unnecessarily include qom/cpu.h, Denis V. Lunev, 2016/01/07
- Re: [Qemu-devel] [PATCH v4 00/11] simplify usage of tracepoints, and connect them to logging, Eric Blake, 2016/01/07
- Re: [Qemu-devel] [PATCH v4 00/11] simplify usage of tracepoints, and connect them to logging, Denis V. Lunev, 2016/01/14
- Re: [Qemu-devel] [PATCH v4 00/11] simplify usage of tracepoints, and connect them to logging, Stefan Hajnoczi, 2016/01/15