Add memory option to test framework VM config

Author: dlon

test/test-manager/src/config/vm.rs

@@ -65,6 +65,11 @@ pub struct VmConfig {
     #[serde(default)]
     #[arg(long)]
     pub vcpu: Option<usize>,
+
+    /// Amount of memory, in MBs
+    #[serde(default)]
+    #[arg(long)]
+    pub memory: Option<usize>,
 }
 
 impl VmConfig {

test/test-manager/src/vm/qemu.rs

@@ -28,6 +28,9 @@ const OBTAIN_IP_TIMEOUT: Duration = Duration::from_secs(180);
 /// Default number of VCPU cores (passed to -smp)
 const DEFAULT_NUM_VCPUS: usize = 2;
 
+/// Default amount of memory, in MBs (passed to -m)
+const DEFAULT_AMOUNT_MEMORY: usize = 2048;
+
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
     #[error("Failed to set up network")]
@@ -86,14 +89,20 @@ pub async fn run(config: &Config, vm_config: &VmConfig) -> Result<QemuInstance>
         .map_err(Error::Network)?;
 
     let mut qemu_cmd = Command::new("qemu-system-x86_64");
+
     let vcpus = vm_config.vcpu.unwrap_or(DEFAULT_NUM_VCPUS);
+    let memory = vm_config.memory.unwrap_or(DEFAULT_AMOUNT_MEMORY);
+
+    log::debug!("CPU count: {vcpus}");
+    log::debug!("Memory: {memory}M");
+
     qemu_cmd.args([
         "-cpu",
         "host",
         "-accel",
         "kvm",
         "-m",
-        "4096",
+        &memory.to_string(),
         "-smp",
         &vcpus.to_string(),
         "-drive",

test/test-manager/src/vm/tart.rs

@@ -59,6 +59,9 @@ pub async fn run(config: &Config, vm_config: &VmConfig) -> Result<TartInstance>
     if let Some(cpu) = vm_config.vcpu {
         tart_cmd.args(["--cpu", &cpu.to_string()]);
     }
+    if vm_config.memory.is_some() {
+        log::warn!("The memory option is not supported for the Tart backend")
+    }
 
     match config.runtime_opts.display {
         config::Display::None => {