| commit | e86aa12ed28a29a821ad550eb6b43183c4ae7e4c | [log] [tgz] |
|---|---|---|
| author | Elie Kheirallah <khei@google.com> | Wed Oct 23 20:37:44 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 23 20:37:44 2024 +0000 |
| tree | bba064f4469ffe10a5a747fd77ff9874749a65be | |
| parent | 168e0dacf4eccb80536719e86103bb902dade6ad [diff] | |
| parent | a52dac6447aa382a9b5b6f5934229cef4fa08b04 [diff] |
Merge "Revert^2 "Add --no-pmu option to VM"" into main am: 69a70b49da am: a52dac6447 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3317608 Change-Id: I6dee9a07d1b7a0bcc9b2ef7a1fd432c582694cb1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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));