Merge "Revert^3 "Enable SVE when available in AVF"" into main am: ccc8743fc6 am: 6923f3ca5c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3464462
Change-Id: Ia46b5c0dfcb8cba4338bea45c3f1834bb9950788
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 df53bc6..096d3b5 100644
--- a/android/virtmgr/src/crosvm.rs
+++ b/android/virtmgr/src/crosvm.rs
@@ -1110,9 +1110,6 @@
command.arg("--mem").arg(memory_mib.to_string());
if let Some(cpus) = config.cpus {
- #[cfg(target_arch = "aarch64")]
- command.arg("--cpus").arg(cpus.to_string() + ",sve=[auto=true]");
- #[cfg(not(target_arch = "aarch64"))]
command.arg("--cpus").arg(cpus.to_string());
}
@@ -1124,12 +1121,7 @@
command.arg("--virt-cpufreq");
}
}
- #[cfg(target_arch = "aarch64")]
- command.arg("--cpus").arg("sve=[auto=true]");
} else if let Some(cpus) = get_num_cpus() {
- #[cfg(target_arch = "aarch64")]
- command.arg("--cpus").arg(cpus.to_string() + ",sve=[auto=true]");
- #[cfg(not(target_arch = "aarch64"))]
command.arg("--cpus").arg(cpus.to_string());
} else {
bail!("Could not determine the number of CPUs in the system");