1 files changed, 16 insertions, 1 deletions

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index a1f4e3669142..8668569d4b2a 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include "map.h"
+#include "thread.h"
 
 const char *map_type__name[MAP__NR_TYPES] = {
         [MAP__FUNCTION] = "Functions",
@@ -585,7 +586,21 @@ int machine__init(struct machine *self, const char *root_dir, pid_t pid)
         self->kmaps.machine = self;
         self->pid           = pid;
         self->root_dir      = strdup(root_dir);
-        return self->root_dir == NULL ? -ENOMEM : 0;
+        if (self->root_dir == NULL)
+                return -ENOMEM;
+
+        if (pid != HOST_KERNEL_ID) {
+                struct thread *thread = machine__findnew_thread(self, pid);
+                char comm[64];
+
+                if (thread == NULL)
+                        return -ENOMEM;
+
+                snprintf(comm, sizeof(comm), "[guest/%d]", pid);
+                thread__set_comm(thread, comm);
+        }
+
+        return 0;
 }
 
 static void dsos__delete(struct list_head *self)