From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755065Ab3K1ItT (ORCPT ); Thu, 28 Nov 2013 03:49:19 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:27782 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1750948Ab3K1ItQ (ORCPT ); Thu, 28 Nov 2013 03:49:16 -0500 X-IronPort-AV: E=Sophos;i="4.93,789,1378828800"; d="scan'208";a="9145329" From: Dongsheng Yang To: linux-kernel@vger.kernel.org Cc: eranian@google.com, dsahern@gmail.com, adrian.hunter@intel.com, acme@ghostprotocols.net, mingo@redhat.com, paulus@samba.org, a.p.zijlstra@chello.nl, Dongsheng Yang Subject: [PATCH] perf machine: Remove condition in machine__get_kernel_start_addr. Date: Thu, 28 Nov 2013 16:47:25 -0500 Message-Id: <1385675245-2224-1-git-send-email-yangds.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.8.2.1 X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/11/28 16:49:10, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/11/28 16:49:16, Serialize complete at 2013/11/28 16:49:16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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) { -- 1.8.2.1