[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 11/20] trace: don't abort qemu if ftrace can't be
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 11/20] trace: don't abort qemu if ftrace can't be initialized |
Date: |
Wed, 12 Oct 2016 10:47:29 +0200 |
From: "Daniel P. Berrange" <address@hidden>
If the ftrace backend is compiled into QEMU, any attempt
to start QEMU while non-root will fail due to the
inability to open /sys/kernel/debug/tracing/tracing_on.
Add a fallback into the code so that it connects up the
trace_marker_fd variable to /dev/null when getting
EACCES on the 'trace_on' file. This allows QEMU to
run, with ftrace turned into a no-op.
[Fixed s/setting/getting/ and s/EACCESS/EACCES/ errors pointed out by
Eric Blake <address@hidden>.
--Stefan]
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
trace/ftrace.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/trace/ftrace.c b/trace/ftrace.c
index e953922..3588bb0 100644
--- a/trace/ftrace.c
+++ b/trace/ftrace.c
@@ -51,6 +51,12 @@ bool ftrace_init(void)
snprintf(path, PATH_MAX, "%s/tracing/tracing_on", debugfs);
trace_fd = open(path, O_WRONLY);
if (trace_fd < 0) {
+ if (errno == EACCES) {
+ trace_marker_fd = open("/dev/null", O_WRONLY);
+ if (trace_marker_fd != -1) {
+ return true;
+ }
+ }
perror("Could not open ftrace 'tracing_on' file");
return false;
} else {
--
2.7.4
- [Qemu-devel] [PULL v2 01/20] trace: move colo trace events to net/ sub-directory, (continued)
- [Qemu-devel] [PULL v2 01/20] trace: move colo trace events to net/ sub-directory, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 04/20] trace: remove some now unused functions, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 02/20] trace: add trace event iterator APIs, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 03/20] trace: convert code to use event iterators, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 05/20] trace: remove global 'uint16 dstate[]' array, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 06/20] trace: remove duplicate control.h includes in generated-tracers.h, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 07/20] trace: break circular dependency in event-internal.h, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 08/20] trace: give each trace event a named TraceEvent struct, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 09/20] trace: remove the TraceEventID and TraceEventVCPUID enums, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 10/20] trace: emit name <-> ID mapping in simpletrace header, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 11/20] trace: don't abort qemu if ftrace can't be initialized,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v2 12/20] trace: provide mechanism for registering trace events, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 13/20] trace: dynamically allocate trace_dstate in CPUState, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 14/20] trace: dynamically allocate event IDs at runtime, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 15/20] trace: get rid of generated-events.h/generated-events.c, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 16/20] trace: rename _read_events to read_events, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 17/20] trace: push reading of events up a level to tracetool main, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 18/20] trace: pass trace-events to tracetool as a positional param, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 20/20] trace: Add missing execution mode of guest events, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 19/20] trace: introduce a formal group name for trace events, Stefan Hajnoczi, 2016/10/12