fix: update VM configuration handling to use semicolon-separated paths and refactor related structures

Author: YanLien

Cargo.lock

@@ -42,13 +42,18 @@ struct ConfigFile {
     pub content: String,
 }
 
-/// Gets the paths (colon-separated) from the `AXVISOR_VM_CONFIGS` environment variable.
+/// Gets the paths (semicolon-separated) from the `AXVISOR_VM_CONFIGS` environment variable.
 ///
 /// Returns `None` if the environment variable is not set.
 fn get_config_paths() -> Option<Vec<OsString>> {
     env::var("AXVISOR_VM_CONFIGS")
         .ok()
-        .map(|paths| env::split_paths(&paths).map(OsString::from).collect())
+        .map(|paths| {
+            paths
+                .split(';')
+                .map(|s| OsString::from(s.trim()))
+                .collect()
+        })
 }
 
 /// Gets the paths and contents of the configuration files specified by the `AXVISOR_VM_CONFIGS` environment variable.

kernel/build.rs

@@ -3,7 +3,7 @@ use ostool::ctx::AppContext;
 pub struct Context {
     pub ctx: AppContext,
     pub build_config_path: Option<std::path::PathBuf>,
-    pub vmconfigs: Vec<String>,
+    pub vmconfigs: String,
 }
 
 impl Context {
@@ -18,7 +18,7 @@ impl Context {
         Context {
             ctx,
             build_config_path: None,
-            vmconfigs: vec![],
+            vmconfigs: String::new(),
         }
     }
 }

xtask/src/ctx.rs

@@ -44,12 +44,15 @@ enum Commands {
 
 #[derive(Parser)]
 struct QemuArgs {
+    /// Path to the build configuration file
     #[arg(long)]
     build_config: Option<PathBuf>,
+    /// Path to the QEMU configuration file
     #[arg(long)]
     qemu_config: Option<PathBuf>,
+    /// VM configuration files (comma-separated paths)
     #[arg(long)]
-    vmconfigs: Vec<String>,
+    vmconfigs: String,
 }
 
 #[derive(Parser)]
@@ -76,12 +79,15 @@ struct ClippyArgs {
 
 #[derive(Parser)]
 struct UbootArgs {
+    /// Path to the build configuration file
     #[arg(long)]
     build_config: Option<PathBuf>,
+    /// Path to the uboot configuration file
     #[arg(long)]
     uboot_config: Option<PathBuf>,
+    /// VM configuration files (comma-separated paths)
     #[arg(long)]
-    vmconfigs: Vec<String>,
+    vmconfigs: String,
 }
 
 #[tokio::main]

xtask/src/main.rs

@@ -45,8 +45,15 @@ impl Context {
 
         self.ctx.build_config_path = Some(config_path);
 
-        let mut vm_configs = config.vm_configs.to_vec();
-        vm_configs.extend(self.vmconfigs.iter().cloned());
+        let vm_configs = if !self.vmconfigs.is_empty() {
+            self.vmconfigs
+                .split(',')
+                .map(|s| s.trim().to_string())
+                .filter(|s| !s.is_empty())
+                .collect()
+        } else {
+            vec![]
+        };
 
         let mut vm_config_paths = vec![];
         for vm_config in &vm_configs {