Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759939Ab2HIWWk (ORCPT ); Thu, 9 Aug 2012 18:22:40 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:42422 "EHLO e7.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759926Ab2HIWWh (ORCPT ); Thu, 9 Aug 2012 18:22:37 -0400 From: Cody P Schafer To: Arnaldo Carvalho de Melo Cc: LKML , Ingo Molnar , Paul Mackerras , Peter Zijlstra , Sukadev Bhattiprolu , Matt Hellsley , David Hansen Subject: [PATCH 10/16] perf symbol: track symtab_type of vmlinux Date: Thu, 9 Aug 2012 15:18:35 -0700 Message-Id: <1344550721-21024-11-git-send-email-cody@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1344550721-21024-1-git-send-email-cody@linux.vnet.ibm.com> References: <1344550721-21024-1-git-send-email-cody@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12080922-5806-0000-0000-00001837C016 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2479 Lines: 74 Previously, symtab_type would have been left at 0, or KALLSYMS, which is not quite accurate. Introduce DSO_SYMTAB_TYPE__VMLINUX[_GUEST]. Signed-off-by: Cody P Schafer --- tools/perf/util/symbol.c | 9 +++++++++ tools/perf/util/symbol.h | 2 ++ 2 files changed, 11 insertions(+) diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 6afc92d..662d1a2 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -1708,6 +1708,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', @@ -1718,6 +1719,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) @@ -1793,7 +1795,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; @@ -2168,6 +2172,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 c8ec1d7..e92bd07 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, -- 1.7.11.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/