From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756790AbbE2Sfl (ORCPT ); Fri, 29 May 2015 14:35:41 -0400 Received: from terminus.zytor.com ([198.137.202.10]:35111 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755347AbbE2Sfe (ORCPT ); Fri, 29 May 2015 14:35:34 -0400 Date: Fri, 29 May 2015 11:35:03 -0700 From: "=?UTF-8?B?dGlwLWJvdCBmb3IgTWFydGluIExpxaFrYQ==?=" Message-ID: Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, a.p.zijlstra@chello.nl, acme@redhat.com, mliska@suse.cz, tglx@linutronix.de, paulus@samba.org, hpa@zytor.com Reply-To: tglx@linutronix.de, paulus@samba.org, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, mliska@suse.cz, acme@redhat.com In-Reply-To: <55685654.2010209@suse.cz> References: <55685654.2010209@suse.cz> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf annotate: Fix -i option, which is currently ignored. Git-Commit-ID: 44848cdbbd1bacbac2a825920b699adc000d51c7 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 44848cdbbd1bacbac2a825920b699adc000d51c7 Gitweb: http://git.kernel.org/tip/44848cdbbd1bacbac2a825920b699adc000d51c7 Author: Martin Liška AuthorDate: Fri, 29 May 2015 14:06:44 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 29 May 2015 12:43:34 -0300 perf annotate: Fix -i option, which is currently ignored. Assign input_name, received from program arguments, to file data structure. Signed-off-by: Martin Liska Tested-by: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/55685654.2010209@suse.cz Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-annotate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index c434e12..4e08c2d 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -289,7 +289,6 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) }, }; struct perf_data_file file = { - .path = input_name, .mode = PERF_DATA_MODE_READ, }; const struct option options[] = { @@ -346,6 +345,8 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) else if (annotate.use_gtk) use_browser = 2; + file.path = input_name; + setup_browser(true); annotate.session = perf_session__new(&file, false, &annotate.tool);