| From 18b6d4825111f2d03aad2159ae987281e41b3a94 Mon Sep 17 00:00:00 2001 |
| From: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Date: Mon, 30 Sep 2019 15:44:13 -0300 |
| Subject: [PATCH] perf annotate: Propagate the symbol__annotate() error return |
| |
| commit 211f493b611eef012841f795166c38ec7528738d upstream. |
| |
| 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 <linux@armlinux.org.uk> |
| Cc: Adrian Hunter <adrian.hunter@intel.com> |
| Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> |
| Cc: Jiri Olsa <jolsa@kernel.org> |
| Cc: Namhyung Kim <namhyung@kernel.org> |
| Cc: Peter Zijlstra <peterz@infradead.org>, |
| Cc: Will Deacon <will@kernel.org> |
| Link: https://lkml.kernel.org/n/tip-0tj89rs9g7nbcyd5skadlvuu@git.kernel.org |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c |
| index a439740f703e..bc0901d12809 100644 |
| --- a/tools/perf/util/annotate.c |
| +++ b/tools/perf/util/annotate.c |
| @@ -2986,7 +2986,7 @@ int symbol__annotate2(struct symbol *sym, struct map *map, struct perf_evsel *ev |
| |
| out_free_offsets: |
| zfree(¬es->offsets); |
| - return -1; |
| + return err; |
| } |
| |
| #define ANNOTATION__CFG(n) \ |
| -- |
| 2.7.4 |
| |