Commit-ID: 2f37573507643407d0a8f38c676ed2e90b795db3 Gitweb: http://git.kernel.org/tip/2f37573507643407d0a8f38c676ed2e90b795db3 Author: Dongsheng Yang <yangds.f...@cn.fujitsu.com> AuthorDate: Wed, 4 Dec 2013 17:56:39 -0500 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitDate: Wed, 4 Dec 2013 13:46:36 -0300
perf tools: Remove condition in machine__get_kernel_start_addr. In machine__get_kernel_start_addr, the code, which is using machine->root_dir to build filename, works for both host and guests initialized from guestmount, as root_dir is set to "" for the host machine in the machine__init() function. So this patch remove the branch for machine__is_host. Signed-off-by: Dongsheng Yang <yangds.f...@cn.fujitsu.com> Cc: David Ahern <dsah...@gmail.com> Cc: Ingo Molnar <mi...@redhat.com> Cc: Jiri Olsa <jo...@redhat.com> Cc: Paul Mackerras <pau...@samba.org> Cc: Peter Zijlstra <a.p.zijls...@chello.nl> Link: http://lkml.kernel.org/r/0a81645dd0b384a12cb4f962cf193ef8c3ce2010.1386197481.git.yangds.f...@cn.fujitsu.com [ Clarified changeset mentioning root_dir setup in machine__init() ] Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/util/machine.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 84cdb07..bac817a 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -502,15 +502,11 @@ static u64 machine__get_kernel_start_addr(struct machine *machine) char path[PATH_MAX]; struct process_args args; - if (machine__is_host(machine)) { - filename = "/proc/kallsyms"; - } else { - if (machine__is_default_guest(machine)) - filename = (char *)symbol_conf.default_guest_kallsyms; - else { - sprintf(path, "%s/proc/kallsyms", machine->root_dir); - filename = path; - } + if (machine__is_default_guest(machine)) + filename = (char *)symbol_conf.default_guest_kallsyms; + else { + sprintf(path, "%s/proc/kallsyms", machine->root_dir); + filename = path; } if (symbol__restricted_filename(filename, "/proc/kallsyms")) -- 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/
