refactor command line

Author: mattkur

petri/src/vm/hyperv/mod.rs

@@ -30,6 +30,7 @@ use crate::hyperv::powershell::HyperVSecureBootTemplate;
 use crate::kmsg_log_task;
 use crate::openhcl_diag::OpenHclDiagHandler;
 use crate::vm::append_cmdline;
+use crate::vm::append_log_params_to_cmdline;
 use anyhow::Context;
 use async_trait::async_trait;
 use get_resources::ged::FirmwareEvent;
@@ -434,9 +435,11 @@ impl PetriVmmBackend for HyperVPetriBackend {
             )
             .await?;
 
-            if let Some(command_line) = command_line {
-                vm.set_vm_firmware_command_line(command_line).await?;
-            }
+            let mut command_line = command_line.clone();
+            append_log_params_to_cmdline(&mut command_line);
+
+            vm.set_vm_firmware_command_line(command_line.unwrap())
+                .await?;
 
             vm.set_vmbus_redirect(*vmbus_redirect).await?;
 

petri/src/vm/hyperv/vm.rs

@@ -484,11 +484,12 @@ impl HyperVVM {
     }
 
     /// Sets the VM firmware command line.
-    pub async fn set_vm_firmware_command_line(
+    pub async fn set_vm_firmware_command_line<S: AsRef<str>>(
         &self,
-        openhcl_command_line: &str,
+        openhcl_command_line: S,
     ) -> anyhow::Result<()> {
-        powershell::run_set_vm_command_line(&self.vmid, &self.ps_mod, openhcl_command_line).await
+        powershell::run_set_vm_command_line(&self.vmid, &self.ps_mod, openhcl_command_line.as_ref())
+            .await
     }
 
     /// Enable VMBusRelay

petri/src/vm/mod.rs

@@ -1795,6 +1795,24 @@ fn append_cmdline(cmd: &mut Option<String>, add_cmd: impl AsRef<str>) {
     }
 }
 
+fn append_log_params_to_cmdline(cmd: &mut Option<String>) {
+    // Forward OPENVMM_LOG and OPENVMM_SHOW_SPANS to OpenHCL if they're set.
+    let openhcl_tracing =
+        if let Ok(x) = std::env::var("OPENVMM_LOG").or_else(|_| std::env::var("HVLITE_LOG")) {
+            format!("OPENVMM_LOG={x}")
+        } else {
+            "OPENVMM_LOG=debug".to_owned()
+        };
+    let openhcl_show_spans = if let Ok(x) = std::env::var("OPENVMM_SHOW_SPANS") {
+        format!("OPENVMM_SHOW_SPANS={x}")
+    } else {
+        "OPENVMM_SHOW_SPANS=true".to_owned()
+    };
+
+    append_cmdline(cmd, openhcl_tracing);
+    append_cmdline(cmd, openhcl_show_spans);
+}
+
 async fn save_inspect(
     name: &str,
     inspect: std::pin::Pin<Box<dyn Future<Output = anyhow::Result<inspect::Node>> + Send>>,

petri/src/vm/openvmm/construct.rs

@@ -30,6 +30,7 @@ use crate::linux_direct_serial_agent::LinuxDirectSerialAgent;
 use crate::openvmm::BOOT_NVME_INSTANCE;
 use crate::openvmm::memdiff_vmgs;
 use crate::vm::append_cmdline;
+use crate::vm::append_log_params_to_cmdline;
 use crate::vtl2_settings::ControllerType;
 use crate::vtl2_settings::Vtl2LunBuilder;
 use crate::vtl2_settings::Vtl2StorageBackingDeviceBuilder;
@@ -587,19 +588,6 @@ impl PetriVmConfigSetupCore<'_> {
     }
 
     fn load_firmware(&self) -> anyhow::Result<LoadMode> {
-        // Forward OPENVMM_LOG and OPENVMM_SHOW_SPANS to OpenHCL if they're set.
-        let openhcl_tracing =
-            if let Ok(x) = std::env::var("OPENVMM_LOG").or_else(|_| std::env::var("HVLITE_LOG")) {
-                format!("OPENVMM_LOG={x}")
-            } else {
-                "OPENVMM_LOG=debug".to_owned()
-            };
-        let openhcl_show_spans = if let Ok(x) = std::env::var("OPENVMM_SHOW_SPANS") {
-            format!("OPENVMM_SHOW_SPANS={x}")
-        } else {
-            "OPENVMM_SHOW_SPANS=true".to_owned()
-        };
-
         Ok(match (self.arch, &self.firmware) {
             (MachineArch::X86_64, Firmware::LinuxDirect { kernel, initrd }) => {
                 let kernel = File::open(kernel.clone())
@@ -697,10 +685,8 @@ impl PetriVmConfigSetupCore<'_> {
 
                 let mut cmdline = command_line.clone();
 
-                append_cmdline(
-                    &mut cmdline,
-                    format!("panic=-1 reboot=triple {openhcl_tracing} {openhcl_show_spans}"),
-                );
+                append_cmdline(&mut cmdline, format!("panic=-1 reboot=triple"));
+                append_log_params_to_cmdline(&mut cmdline);
 
                 let isolated = match self.firmware {
                     Firmware::OpenhclLinuxDirect { .. } => {