From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
"Daniel P. Berrange" <berrange@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PULL 11/20] trace: don't abort qemu if ftrace can't be initialized
Date: Fri, 7 Oct 2016 11:09:30 +0100 [thread overview]
Message-ID: <1475834979-4980-12-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1475834979-4980-1-git-send-email-stefanha@redhat.com>
From: "Daniel P. Berrange" <berrange@redhat.com>
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 <eblake@redhat.com>.
--Stefan]
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 1475588159-30598-13-git-send-email-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
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
next prev parent reply other threads:[~2016-10-07 10:10 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-07 10:09 [Qemu-devel] [PULL 00/20] Tracing patches Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 01/20] trace: move colo trace events to net/ sub-directory Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 02/20] trace: add trace event iterator APIs Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 03/20] trace: convert code to use event iterators Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 04/20] trace: remove some now unused functions Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 05/20] trace: remove global 'uint16 dstate[]' array Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 06/20] trace: remove duplicate control.h includes in generated-tracers.h Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 07/20] trace: break circular dependency in event-internal.h Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 08/20] trace: give each trace event a named TraceEvent struct Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 09/20] trace: remove the TraceEventID and TraceEventVCPUID enums Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 10/20] trace: emit name <-> ID mapping in simpletrace header Stefan Hajnoczi
2016-10-07 10:09 ` Stefan Hajnoczi [this message]
2016-10-07 10:09 ` [Qemu-devel] [PULL 12/20] trace: provide mechanism for registering trace events Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 13/20] trace: dynamically allocate trace_dstate in CPUState Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 14/20] trace: dynamically allocate event IDs at runtime Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 15/20] trace: get rid of generated-events.h/generated-events.c Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 16/20] trace: rename _read_events to read_events Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 17/20] trace: push reading of events up a level to tracetool main Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 18/20] trace: pass trace-events to tracetool as a positional param Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 19/20] trace: introduce a formal group name for trace events Stefan Hajnoczi
2016-10-07 10:09 ` [Qemu-devel] [PULL 20/20] trace: Add missing execution mode of guest events Stefan Hajnoczi
2016-10-07 13:22 ` [Qemu-devel] [PULL 00/20] Tracing patches Peter Maydell
2016-10-07 13:35 ` Daniel P. Berrange
2016-10-07 13:46 ` Lluís Vilanova
2016-10-07 14:16 ` Peter Maydell
2016-10-07 14:19 ` Daniel P. Berrange
2016-10-07 17:51 ` Lluís Vilanova
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1475834979-4980-12-git-send-email-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=berrange@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).