Messages in this thread | | | Date | Thu, 28 Nov 2013 16:51:32 -0500 | From | Dongsheng Yang <> | Subject | Re: [PATCH] perf machine: Remove condition in machine__get_kernel_start_addr. |
| |
Sorry for the error patch :(, Please ignore it.
On 11/28/2013 04:47 PM, Dongsheng Yang wrote: > 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. So this patch > remove the branch for machine__is_host. > > Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com> > --- > tools/perf/util/machine.c | 16 ++++++---------- > 1 file changed, 6 insertions(+), 10 deletions(-) > > diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c > index 84cdb07..52d9161 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")) > @@ -589,7 +585,7 @@ int machines__create_guest_kernel_maps(struct machines *machines) > if (symbol_conf.default_guest_vmlinux_name || > symbol_conf.default_guest_modules || > symbol_conf.default_guest_kallsyms) { > - machines__create_kernel_maps(machines, DEFAULT_GUEST_KERNEL_ID); > + machines__create_kernel_maps(machines, 20315); > } > > if (symbol_conf.guestmount) {
| |