commit e108d05a09845f04bf4578f811c39d0b0aa213ca
author Elie Kheirallah <khei@google.com> Fri Jan 24 11:04:19 2025 -0800
committer Elie Kheirallah <khei@google.com> Fri Jan 24 12:01:44 2025 -0800
tree 0e737f2c3de346781451a81fe69004b5ac705647
parent 35106c840cd21e50aa2c4d9364cdb98dcb09d11e

Revert^2 "Enable SVE when available in AVF"

This reverts commit 75621c84adc390ade2066dcdbc2915f2a1bf81ff.

Reason for revert: Fixed issue which was SVE enabled on all architectures. It's now properly gated for Aarch64

Bug: 376260018
Test: ABTD, TH

Change-Id: I857dacfedef5894766679b53b31f7791dc5c83cf

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");