redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

perf kvm stat live: Fix perf_evlist__add_pollfd error handling

Browse source 
With the interface changed in following commit:

  2171a92568 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>
This commit is contained in:
Jiri Olsa 2014-10-01 18:00:27 +02:00 committed by Arnaldo Carvalho de Melo
parent cc6cd47e73
commit fe636adda6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/perf/builtin-kvm.c
View file

@ -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;