Add options for configuring number of vCPUs and CPU affinity
Bug: 197358423
Test: atest MicrodroidHostTestCases
Change-Id: I61a7e746ddd83a1816d18166fb74f4aa5a2565ce
diff --git a/virtualizationservice/src/crosvm.rs b/virtualizationservice/src/crosvm.rs
index bf1ff0c..0b1429c 100644
--- a/virtualizationservice/src/crosvm.rs
+++ b/virtualizationservice/src/crosvm.rs
@@ -45,6 +45,8 @@
pub params: Option<String>,
pub protected: bool,
pub memory_mib: Option<NonZeroU32>,
+ pub cpus: Option<NonZeroU32>,
+ pub cpu_affinity: Option<String>,
pub console_fd: Option<File>,
pub log_fd: Option<File>,
pub indirect_files: Vec<File>,
@@ -246,6 +248,14 @@
command.arg("--mem").arg(memory_mib.to_string());
}
+ if let Some(cpus) = config.cpus {
+ command.arg("--cpus").arg(cpus.to_string());
+ }
+
+ if let Some(cpu_affinity) = config.cpu_affinity {
+ command.arg("--cpu-affinity").arg(cpu_affinity);
+ }
+
// Keep track of what file descriptors should be mapped to the crosvm process.
let mut preserved_fds = config.indirect_files.iter().map(|file| file.as_raw_fd()).collect();