commit 1944db36bb0a321f7e78000dd628eaeec9393065
author Elie Kheirallah <khei@google.com> Wed Jan 29 13:08:30 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 29 13:08:30 2025 -0800
tree 0e737f2c3de346781451a81fe69004b5ac705647
parent 0a228b7ca90b1b2ac2ec0eb7917927884e65dd2b

Revert^4 "Enable SVE when available in AVF"

This reverts commit 0a228b7ca90b1b2ac2ec0eb7917927884e65dd2b.

Reason for revert: Fixed in upstream crosvm, pushing this CL with the crosvm required change

Change-Id: I1c8b24dbe04787a26e541c7de15b91c9d0b090e4

android/virtmgr/src/crosvm.rs

diff --git a/android/virtmgr/src/crosvm.rs b/android/virtmgr/src/crosvm.rs
index 096d3b5..df53bc6 100644
--- a/android/virtmgr/src/crosvm.rs
+++ b/android/virtmgr/src/crosvm.rs
@@ -1110,6 +1110,9 @@
     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());
     }
 
@@ -1121,7 +1124,12 @@
                     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");