Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.fnst@cn.fujitsu.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/0a81645dd0b384a12cb4f962cf193ef8c3ce2010.1386197481.git.yangds.fnst@cn.fujitsu.com
[ Clarified changeset mentioning root_dir setup in machine__init() ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Dongsheng Yang and committed by
Arnaldo Carvalho de Melo
2f375735 e6d7cee1

+5 -9
+5 -9
tools/perf/util/machine.c
··· 502 502 char path[PATH_MAX]; 503 503 struct process_args args; 504 504 505 - if (machine__is_host(machine)) { 506 - filename = "/proc/kallsyms"; 507 - } else { 508 - if (machine__is_default_guest(machine)) 509 - filename = (char *)symbol_conf.default_guest_kallsyms; 510 - else { 511 - sprintf(path, "%s/proc/kallsyms", machine->root_dir); 512 - filename = path; 513 - } 505 + if (machine__is_default_guest(machine)) 506 + filename = (char *)symbol_conf.default_guest_kallsyms; 507 + else { 508 + sprintf(path, "%s/proc/kallsyms", machine->root_dir); 509 + filename = path; 514 510 } 515 511 516 512 if (symbol__restricted_filename(filename, "/proc/kallsyms"))