From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Corey Ashford <cjashfor@linux.vnet.ibm.com>,
David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Milian Wolff <mail@milianw.de>,
Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 01/24] perf kvm stat live: Fix perf_evlist__add_pollfd error handling
Date: Tue, 14 Oct 2014 18:04:10 -0300 [thread overview]
Message-ID: <1413320673-5784-2-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1413320673-5784-1-git-send-email-acme@kernel.org>
From: Jiri Olsa <jolsa@kernel.org>
With the interface changed in following commit:
2171a9256862 tools lib fd array: Allow associating an integer cookie with each entry
the perf_evlist__add_pollfd function now returns the fd position in the
pollfd array.
We need to change this function's error check condition.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Milian Wolff <mail@milianw.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1412179229-19466-3-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-kvm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index d8bf2271f4ea..663d6eda0822 100644
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -928,12 +928,12 @@ static int kvm_events_live_report(struct perf_kvm_stat *kvm)
goto out;
}
- if (perf_evlist__add_pollfd(kvm->evlist, kvm->timerfd))
+ if (perf_evlist__add_pollfd(kvm->evlist, kvm->timerfd) < 0)
goto out;
nr_fds++;
- if (perf_evlist__add_pollfd(kvm->evlist, fileno(stdin)))
+ if (perf_evlist__add_pollfd(kvm->evlist, fileno(stdin)) < 0)
goto out;
nr_stdin = nr_fds;
--
1.9.3
next prev parent reply other threads:[~2014-10-14 21:04 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-14 21:04 [GIT PULL 00/24] perf/core improvements and fixes Arnaldo Carvalho de Melo
2014-10-14 21:04 ` Arnaldo Carvalho de Melo [this message]
2014-10-14 21:04 ` [PATCH 02/24] perf kvm stat live: Use perf_evlist__add_pollfd return fd position Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 03/24] perf kvm stat live: Use fdarray object instead of pollfd Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 04/24] perf callchain: Move callchain_param to util object in to fix python test Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 05/24] perf sched: Stop updating hists stats, not used Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 06/24] perf script: " Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 07/24] perf evsel: Add hists helper Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 08/24] perf session: Don't count per evsel events Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 09/24] perf tools: Move events_stats struct to event.h Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 10/24] perf ui browsers: Add missing include Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 11/24] perf session: Remove last reference to hists struct Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 12/24] perf evsel: Subclassing Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 13/24] perf callchain: Move the callchain_param extern to callchain.h Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 14/24] perf tools: Remove hists from evsel Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 15/24] perf thread_map: Create dummy constructor out of open coded equivalent Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 16/24] perf evlist: Check that there is a thread_map when preparing a workload Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 17/24] perf evlist: Default to syswide target when no thread/cpu maps set Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 18/24] perf evsel: Add missing 'target' struct forward declaration Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 19/24] perf evsel: Make some exit routines static Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 20/24] perf machine: Add missing dsos->root rbtree root initialization Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 21/24] perf tools: fix off-by-one error in maps Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 22/24] perf tools: Fixup off-by-one comparision in maps__find Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 23/24] perf symbols: Fix map->end fixup Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 24/24] perf symbols: Make sym->end be the first address after the symbol range Arnaldo Carvalho de Melo
2014-10-15 9:56 ` [GIT PULL 00/24] perf/core improvements and fixes Ingo Molnar
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=1413320673-5784-2-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mail@milianw.de \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.