Commit-ID: 21ea4539b4d1b26de7f2eb227b5d1a092b32cc19 Gitweb: http://git.kernel.org/tip/21ea4539b4d1b26de7f2eb227b5d1a092b32cc19 Author: Cody P Schafer <c...@linux.vnet.ibm.com> AuthorDate: Fri, 10 Aug 2012 15:22:56 -0700 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitDate: Mon, 13 Aug 2012 14:26:18 -0300
perf symbols: Track symtab_type of vmlinux Previously, symtab_type would have been left at 0, or KALLSYMS, which is not quite accurate. Introduce DSO_BINARY_TYPE__VMLINUX[_GUEST]. Signed-off-by: Cody P Schafer <c...@linux.vnet.ibm.com> Cc: David Hansen <d...@linux.vnet.ibm.com> Cc: Ingo Molnar <mi...@redhat.com> Cc: Matt Hellsley <matth...@us.ibm.com> Cc: Namhyung Kim <namhy...@kernel.org> Cc: Paul Mackerras <pau...@samba.org> Cc: Peter Zijlstra <a.p.zijls...@chello.nl> Cc: Sukadev Bhattiprolu <suka...@linux.vnet.ibm.com> Link: http://lkml.kernel.org/r/1344637382-22789-11-git-send-email-c...@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/util/symbol.c | 9 +++++++++ tools/perf/util/symbol.h | 2 ++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 96dbf28..8f5cabbf 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -923,6 +923,7 @@ char dso__symtab_origin(const struct dso *dso) { static const char origin[] = { [DSO_BINARY_TYPE__KALLSYMS] = 'k', + [DSO_BINARY_TYPE__VMLINUX] = 'v', [DSO_BINARY_TYPE__JAVA_JIT] = 'j', [DSO_BINARY_TYPE__DEBUGLINK] = 'l', [DSO_BINARY_TYPE__BUILD_ID_CACHE] = 'B', @@ -933,6 +934,7 @@ char dso__symtab_origin(const struct dso *dso) [DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE] = 'K', [DSO_BINARY_TYPE__GUEST_KALLSYMS] = 'g', [DSO_BINARY_TYPE__GUEST_KMODULE] = 'G', + [DSO_BINARY_TYPE__GUEST_VMLINUX] = 'V', }; if (dso == NULL || dso->symtab_type == DSO_BINARY_TYPE__NOT_FOUND) @@ -1008,7 +1010,9 @@ int dso__binary_type_file(struct dso *dso, enum dso_binary_type type, default: case DSO_BINARY_TYPE__KALLSYMS: + case DSO_BINARY_TYPE__VMLINUX: case DSO_BINARY_TYPE__GUEST_KALLSYMS: + case DSO_BINARY_TYPE__GUEST_VMLINUX: case DSO_BINARY_TYPE__JAVA_JIT: case DSO_BINARY_TYPE__NOT_FOUND: ret = -1; @@ -1364,6 +1368,11 @@ int dso__load_vmlinux(struct dso *dso, struct map *map, if (fd < 0) return -1; + if (dso->kernel == DSO_TYPE_GUEST_KERNEL) + dso->symtab_type = DSO_BINARY_TYPE__GUEST_VMLINUX; + else + dso->symtab_type = DSO_BINARY_TYPE__VMLINUX; + err = dso__load_sym(dso, map, symfs_vmlinux, fd, filter, 0, 0); close(fd); diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h index c9534fe..37f1ea1 100644 --- a/tools/perf/util/symbol.h +++ b/tools/perf/util/symbol.h @@ -158,6 +158,8 @@ struct addr_location { enum dso_binary_type { DSO_BINARY_TYPE__KALLSYMS = 0, DSO_BINARY_TYPE__GUEST_KALLSYMS, + DSO_BINARY_TYPE__VMLINUX, + DSO_BINARY_TYPE__GUEST_VMLINUX, DSO_BINARY_TYPE__JAVA_JIT, DSO_BINARY_TYPE__DEBUGLINK, DSO_BINARY_TYPE__BUILD_ID_CACHE, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
