From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB2B7C352AA for ; Tue, 1 Oct 2019 11:13:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9460821924 for ; Tue, 1 Oct 2019 11:13:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569928439; bh=lt2HJAsgxBaUFP0vPOW77yGuoGc3YBs/ejfMCjkkHvA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QnNYTNZL+6l0BhCiYZTbbYOC50R3DZ12qcxZsnZ2nKjotKIEw42V6JJTx+IABeROq 2+HESMlzhE6K1Ktu3OO9DQrxFwd3l4IrHGZrwatMWlPHuIfrgBU4xtRmzkOGqgyItm cNwiw2u4ExU1KLfHVLJPF1Xy7WOdTEXEB+7x58z0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732123AbfJALN6 (ORCPT ); Tue, 1 Oct 2019 07:13:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:35920 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731944AbfJALN4 (ORCPT ); Tue, 1 Oct 2019 07:13:56 -0400 Received: from quaco.ghostprotocols.net (177.206.223.101.dynamic.adsl.gvt.net.br [177.206.223.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6A11221920; Tue, 1 Oct 2019 11:13:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569928435; bh=lt2HJAsgxBaUFP0vPOW77yGuoGc3YBs/ejfMCjkkHvA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ot2krKLuq0M9RmD/e+KHAZoFS190B7cyPKxCGKp6WQa9on6X92Rn2JgO2fgAS3/3P 25K9CThNOCzUFivxg0VplQJ3fXw+bn0VbGOVumsQ8LIG9DG/ehdQjTiOKMpIrGF2Qx utdeW0V1shdSRheqCTR340+gJKeOr81OenXOwHAs= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Russell King - ARM Linux admin , Adrian Hunter , Alexander Shishkin , Peter Zijlstra , Will Deacon Subject: [PATCH 21/24] perf annotate: Propagate the symbol__annotate() error return Date: Tue, 1 Oct 2019 08:12:13 -0300 Message-Id: <20191001111216.7208-22-acme@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191001111216.7208-1-acme@kernel.org> References: <20191001111216.7208-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnaldo Carvalho de Melo We were just returning -1 in symbol__annotate() when symbol__annotate() failed, propagate its error as it is used later to pass to symbol__strerror_disassemble() to present a error message to the user, that in some cases were getting: "Invalid -1 error code" Fix it to propagate the error. Reported-by: Russell King - ARM Linux admin Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra , Cc: Will Deacon Link: https://lkml.kernel.org/n/tip-0tj89rs9g7nbcyd5skadlvuu@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 95109acf4808..1de1a7091c48 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -2997,7 +2997,7 @@ int symbol__annotate2(struct symbol *sym, struct map *map, struct evsel *evsel, out_free_offsets: zfree(¬es->offsets); - return -1; + return err; } #define ANNOTATION__CFG(n) \ -- 2.21.0