1 files changed, 8 insertions, 5 deletions

diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index 0c36f2ac6a0e..55d919dc5bc6 100644
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -26,6 +26,9 @@
 #include <sys/timerfd.h>
 #endif
 #include <sys/time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 #include <linux/kernel.h>
 #include <linux/time64.h>
@@ -741,20 +744,20 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx,
                                    u64 *mmap_time)
 {
         union perf_event *event;
-        struct perf_sample sample;
+        u64 timestamp;
         s64 n = 0;
         int err;
 
         *mmap_time = ULLONG_MAX;
         while ((event = perf_evlist__mmap_read(kvm->evlist, idx)) != NULL) {
-                err = perf_evlist__parse_sample(kvm->evlist, event, &sample);
+                err = perf_evlist__parse_sample_timestamp(kvm->evlist, event, &timestamp);
                 if (err) {
                         perf_evlist__mmap_consume(kvm->evlist, idx);
                         pr_err("Failed to parse sample\n");
                         return -1;
                 }
 
-                err = perf_session__queue_event(kvm->session, event, &sample, 0);
+                err = perf_session__queue_event(kvm->session, event, timestamp, 0);
                 /*
                  * FIXME: Here we can't consume the event, as perf_session__queue_event will
                  *        point to it, and it'll get possibly overwritten by the kernel.
@@ -768,7 +771,7 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx,
 
                 /* save time stamp of our first sample for this mmap */
                 if (n == 0)
-                        *mmap_time = sample.time;
+                        *mmap_time = timestamp;
 
                 /* limit events per mmap handled all at once */
                 n++;
@@ -1044,7 +1047,7 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm)
                 goto out;
         }
 
-        if (perf_evlist__mmap(evlist, kvm->opts.mmap_pages, false) < 0) {
+        if (perf_evlist__mmap(evlist, kvm->opts.mmap_pages) < 0) {
                 ui__error("Failed to mmap the events: %s\n",
                           str_error_r(errno, sbuf, sizeof(sbuf)));
                 perf_evlist__close(evlist);