diff options
Diffstat (limited to 'tools/perf/util/map.c')
-rw-r--r-- | tools/perf/util/map.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index 35ae56864e4f..a1f4e3669142 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c | |||
@@ -669,25 +669,26 @@ struct machine *machines__find(struct rb_root *self, pid_t pid) | |||
669 | struct machine *machines__findnew(struct rb_root *self, pid_t pid) | 669 | struct machine *machines__findnew(struct rb_root *self, pid_t pid) |
670 | { | 670 | { |
671 | char path[PATH_MAX]; | 671 | char path[PATH_MAX]; |
672 | const char *root_dir; | 672 | const char *root_dir = ""; |
673 | struct machine *machine = machines__find(self, pid); | 673 | struct machine *machine = machines__find(self, pid); |
674 | 674 | ||
675 | if (!machine || machine->pid != pid) { | 675 | if (machine && (machine->pid == pid)) |
676 | if (pid == HOST_KERNEL_ID || pid == DEFAULT_GUEST_KERNEL_ID) | 676 | goto out; |
677 | root_dir = ""; | 677 | |
678 | else { | 678 | if ((pid != HOST_KERNEL_ID) && |
679 | if (!symbol_conf.guestmount) | 679 | (pid != DEFAULT_GUEST_KERNEL_ID) && |
680 | goto out; | 680 | (symbol_conf.guestmount)) { |
681 | sprintf(path, "%s/%d", symbol_conf.guestmount, pid); | 681 | sprintf(path, "%s/%d", symbol_conf.guestmount, pid); |
682 | if (access(path, R_OK)) { | 682 | if (access(path, R_OK)) { |
683 | pr_err("Can't access file %s\n", path); | 683 | pr_err("Can't access file %s\n", path); |
684 | goto out; | 684 | machine = NULL; |
685 | } | 685 | goto out; |
686 | root_dir = path; | ||
687 | } | 686 | } |
688 | machine = machines__add(self, pid, root_dir); | 687 | root_dir = path; |
689 | } | 688 | } |
690 | 689 | ||
690 | machine = machines__add(self, pid, root_dir); | ||
691 | |||
691 | out: | 692 | out: |
692 | return machine; | 693 | return machine; |
693 | } | 694 | } |