Commit fe636add authored Oct 01, 2014 by Jiri Olsa Committed by Arnaldo Carvalho de Melo Oct 03, 2014

perf kvm stat live: Fix perf_evlist__add_pollfd error handling



With the interface changed in following commit:

  2171a925 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>

parent cc6cd47e

tools/perf/builtin-kvm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;