Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753040AbaJAQBV (ORCPT ); Wed, 1 Oct 2014 12:01:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29716 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752973AbaJAQBT (ORCPT ); Wed, 1 Oct 2014 12:01:19 -0400 From: Jiri Olsa To: linux-kernel@vger.kernel.org Cc: Jiri Olsa , Adrian Hunter , Arnaldo Carvalho de Melo , Corey Ashford , David Ahern , Frederic Weisbecker , Ingo Molnar , Milian Wolff , Namhyung Kim , Paul Mackerras , Peter Zijlstra Subject: [PATCH 4/5] perf kvm stat live: Use perf_evlist__add_pollfd return fd position Date: Wed, 1 Oct 2014 18:00:28 +0200 Message-Id: <1412179229-19466-4-git-send-email-jolsa@kernel.org> In-Reply-To: <1412179229-19466-1-git-send-email-jolsa@kernel.org> References: <1412179229-19466-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.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. Hence we no longer need to count the fd position, because we get it as the return value. Cc: Adrian Hunter Cc: Arnaldo Carvalho de Melo Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Milian Wolff Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Signed-off-by: Jiri Olsa --- 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 663d6eda0822..dc7d704735bd 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -933,10 +933,10 @@ static int kvm_events_live_report(struct perf_kvm_stat *kvm) nr_fds++; - if (perf_evlist__add_pollfd(kvm->evlist, fileno(stdin)) < 0) + nr_stdin = perf_evlist__add_pollfd(kvm->evlist, fileno(stdin)); + if (nr_stdin < 0) goto out; - nr_stdin = nr_fds; nr_fds++; if (fd_set_nonblock(fileno(stdin)) != 0) goto out; -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/