commit 69a70b49daf64ec664fc8a627be9aa9e380b400e
author Elie Kheirallah <khei@google.com> Wed Oct 23 20:05:48 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 23 20:05:48 2024 +0000
tree 7fd64c1369b5458de7f77acbce8b8b3a9b4be6af
parent bd99d50cc6974b3b754b1af15781c819d733bb76
parent 35dbb8eacebf3c3228160c46b2923ee9d5fb95f1

Merge "Revert^2 "Add --no-pmu option to VM"" into main

android/virtmgr/src/crosvm.rs

diff --git a/android/virtmgr/src/crosvm.rs b/android/virtmgr/src/crosvm.rs
index 25271f8..ed45a51 100644
--- a/android/virtmgr/src/crosvm.rs
+++ b/android/virtmgr/src/crosvm.rs
@@ -1062,6 +1062,9 @@
         command.arg(add_preserved_fd(&mut preserved_fds, kernel));
     }
 
+    #[cfg(target_arch = "aarch64")]
+    command.arg("--no-pmu");
+
     let control_sock = create_crosvm_control_listener(crosvm_control_socket_path)
         .context("failed to create control listener")?;
     command.arg("--socket").arg(add_preserved_fd(&mut preserved_fds, control_sock));