From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756639AbdJJRYx (ORCPT ); Tue, 10 Oct 2017 13:24:53 -0400 Received: from mga07.intel.com ([134.134.136.100]:34437 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756577AbdJJRUx (ORCPT ); Tue, 10 Oct 2017 13:20:53 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,359,1503385200"; d="scan'208";a="137137291" From: kan.liang@intel.com To: acme@kernel.org, peterz@infradead.org, mingo@redhat.com, linux-kernel@vger.kernel.org Cc: jolsa@kernel.org, wangnan0@huawei.com, hekuang@huawei.com, namhyung@kernel.org, alexander.shishkin@linux.intel.com, adrian.hunter@intel.com, ak@linux.intel.com, Kan Liang Subject: [PATCH 07/10] perf kvm: apply new mmap_read interfaces Date: Tue, 10 Oct 2017 10:20:20 -0700 Message-Id: <1507656023-177125-8-git-send-email-kan.liang@intel.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1507656023-177125-1-git-send-email-kan.liang@intel.com> References: <1507656023-177125-1-git-send-email-kan.liang@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kan Liang no functional change Signed-off-by: Kan Liang --- tools/perf/builtin-kvm.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 721f4f9..397a6b6 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -741,11 +741,18 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx, { union perf_event *event; struct perf_sample sample; + struct perf_mmap_read read; s64 n = 0; int err; *mmap_time = ULLONG_MAX; - while ((event = perf_evlist__mmap_read(kvm->evlist, idx)) != NULL) { + + if (perf_evlist__mmap_read_init(kvm->evlist, idx, &read, false)) { + pr_err("Can't get mmap information\n"); + return -1; + } + + while ((event = perf_mmap__read_event(&read)) != NULL) { err = perf_evlist__parse_sample(kvm->evlist, event, &sample); if (err) { perf_evlist__mmap_consume(kvm->evlist, idx); @@ -774,6 +781,7 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx, if (n == PERF_KVM__MAX_EVENTS_PER_MMAP) break; } + perf_mmap__read_done(&read); return n; } -- 2.5.5