OSDN Git Service

perf kvm stat live: Fix perf_evlist__add_pollfd error handling
authorJiri Olsa <jolsa@kernel.org>
Wed, 1 Oct 2014 16:00:27 +0000 (18:00 +0200)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 3 Oct 2014 12:39:47 +0000 (09:39 -0300)
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

index d8bf227..663d6ed 100644 (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;