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