[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/9] trace: split trace_init_events out of trace_ini
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 2/9] trace: split trace_init_events out of trace_init_backends |
Date: |
Sun, 25 Oct 2015 14:32:02 +0100 |
This is cleaner and has two advantages. First, it improves error
reporting with -daemonize. Second, multiple "-trace events" options
now cumulate.
Signed-off-by: Paolo Bonzini <address@hidden>
---
trace/control.c | 5 ++---
trace/control.h | 15 ++++++++++++---
vl.c | 8 ++++----
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/trace/control.c b/trace/control.c
index 995beb3..ee5fbca 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -85,7 +85,7 @@ TraceEvent *trace_event_pattern(const char *pat, TraceEvent
*ev)
return NULL;
}
-static void trace_init_events(const char *fname)
+void trace_init_events(const char *fname)
{
Location loc;
FILE *fp;
@@ -142,7 +142,7 @@ static void trace_init_events(const char *fname)
loc_pop(&loc);
}
-bool trace_init_backends(const char *events, const char *file)
+bool trace_init_backends(const char *file)
{
#ifdef CONFIG_TRACE_SIMPLE
if (!st_init(file)) {
@@ -164,6 +164,5 @@ bool trace_init_backends(const char *events, const char
*file)
}
#endif
- trace_init_events(events);
return true;
}
diff --git a/trace/control.h b/trace/control.h
index da9bb6b..bfbe560 100644
--- a/trace/control.h
+++ b/trace/control.h
@@ -150,8 +150,6 @@ static void trace_event_set_state_dynamic(TraceEvent *ev,
bool state);
/**
* trace_init_backends:
- * @events: Name of file with events to be enabled at startup; may be NULL.
- * Corresponds to commandline option "-trace events=...".
* @file: Name of trace output file; may be NULL.
* Corresponds to commandline option "-trace file=...".
*
@@ -159,7 +157,18 @@ static void trace_event_set_state_dynamic(TraceEvent *ev,
bool state);
*
* Returns: Whether the backends could be successfully initialized.
*/
-bool trace_init_backends(const char *events, const char *file);
+bool trace_init_backends(const char *file);
+
+/**
+ * trace_init_events:
+ * @events: Name of file with events to be enabled at startup; may be NULL.
+ * Corresponds to commandline option "-trace events=...".
+ *
+ * Read the list of enabled tracing events.
+ *
+ * Returns: Whether the backends could be successfully initialized.
+ */
+void trace_init_events(const char *file);
#include "trace/control-internal.h"
diff --git a/vl.c b/vl.c
index dffaf09..ba29fef 100644
--- a/vl.c
+++ b/vl.c
@@ -2956,7 +2956,6 @@ int main(int argc, char **argv, char **envp)
bool userconfig = true;
const char *log_mask = NULL;
const char *log_file = NULL;
- const char *trace_events = NULL;
const char *trace_file = NULL;
ram_addr_t maxram_size;
uint64_t ram_slots = 0;
@@ -3881,8 +3880,9 @@ int main(int argc, char **argv, char **envp)
if (!opts) {
exit(1);
}
- trace_events = qemu_opt_get(opts, "events");
+ trace_init_events(qemu_opt_get(opts, "events"));
trace_file = qemu_opt_get(opts, "file");
+ qemu_opts_del(opts);
break;
}
case QEMU_OPTION_readconfig:
@@ -4079,7 +4079,7 @@ int main(int argc, char **argv, char **envp)
}
if (!is_daemonized()) {
- if (!trace_init_backends(trace_events, trace_file)) {
+ if (!trace_init_backends(trace_file)) {
exit(1);
}
}
@@ -4631,7 +4631,7 @@ int main(int argc, char **argv, char **envp)
os_setup_post();
if (is_daemonized()) {
- if (!trace_init_backends(trace_events, trace_file)) {
+ if (!trace_init_backends(trace_file)) {
exit(1);
}
}
--
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 <=
- [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, 2015/10/25
- Re: [Qemu-devel] [PATCH 0/9] simplify usage of tracepoints, and connect them to logging, Peter Maydell, 2015/10/25