[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/15] trace: split trace_init_events out of trace_in
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 06/15] trace: split trace_init_events out of trace_init_backends |
Date: |
Tue, 10 Nov 2015 13:31:39 +0000 |
From: Paolo Bonzini <address@hidden>
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>
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>
---
qemu-io.c | 2 +-
trace/control.c | 5 ++---
trace/control.h | 15 ++++++++++++---
vl.c | 8 ++++----
4 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/qemu-io.c b/qemu-io.c
index 269f17c..d6fa11b 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -440,7 +440,7 @@ int main(int argc, char **argv)
}
break;
case 'T':
- if (!trace_init_backends(optarg, NULL)) {
+ if (!trace_init_backends(optarg)) {
exit(1); /* error message will have been printed */
}
break;
diff --git a/trace/control.c b/trace/control.c
index 700440c..931d64c 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -88,7 +88,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;
@@ -145,7 +145,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)) {
@@ -167,6 +167,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 6af7ddc..7905917 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 21e8876..4df502c 100644
--- a/vl.c
+++ b/vl.c
@@ -2991,7 +2991,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;
@@ -3908,8 +3907,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:
@@ -4109,7 +4109,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);
}
}
@@ -4672,7 +4672,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] [PULL 00/15] Tracing patches, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 01/15] trace: fix make foo-timestamp rules, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 03/15] trace: count number of enabled events, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 02/15] trace: add make dependencies on tracetool source, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 04/15] trace: track enabled events in a separate array, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 05/15] trace: fix documentation, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 07/15] trace: split trace_init_file out of trace_init_backends, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 06/15] trace: split trace_init_events out of trace_init_backends,
Stefan Hajnoczi <=
- [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, 2015/11/10