project | libvirt: Minor config changes

I have changed some config changes like setting a default filesystem to
make it more aligned to what the code says. And what my expectations
are.

libvirt:
   - add default filesystem var. (ext4 because it is allready used)
   - libvirt run: use default filesystem (Add by ai. Not manualy checked. Maybe i shouldn't use it.)

project up:
 - use default fs
 - use relative path

project down:
 - add --force flag that is passed down to libvirt functions
 - inlined functions

Assisted-by: Cursor's automatic modelswicher
Signed-off-by: Colin Walters <[email protected]>

Author: sysvion

crates/kit/src/libvirt/mod.rs

@@ -23,6 +23,9 @@ pub const LIBVIRT_DEFAULT_MEMORY: &str = "4G";
 /// Default disk size for libvirt base disks
 pub const LIBVIRT_DEFAULT_DISK_SIZE: &str = "20G";
 
+/// Default filesystem for libvirt VMs
+pub const LIBVIRT_DEFAULT_FILESYSTEM: &str = "ext4";
+
 pub mod base_disks;
 pub mod base_disks_cli;
 pub mod domain;

crates/kit/src/libvirt/run.rs

@@ -1003,7 +1003,7 @@ fn create_libvirt_domain_from_disk(
             opts.install
                 .filesystem
                 .as_ref()
-                .unwrap_or(&"ext4".to_string()),
+                .unwrap_or(&crate::libvirt::LIBVIRT_DEFAULT_FILESYSTEM.to_string()),
         )
         .with_metadata("bootc:network", &opts.network)
         .with_metadata("bootc:ssh-generated", "true")

crates/kit/src/project/down.rs

@@ -19,6 +19,9 @@ pub struct ProjectDownOpts {
     /// Remove the VM after shutting it down
     #[clap(long)]
     pub remove: bool,
+
+    #[clap(long)]
+    pub force: bool,
 }
 
 /// Run the project down command
@@ -38,18 +41,31 @@ pub fn run(opts: ProjectDownOpts) -> Result<()> {
     };
 
     if !check_vm_exists(&vm_name, &libvirt_opts)? {
-        println!("Project VM '{}' does not exist", vm_name);
+        println!("Project is already down. vm_name: '{}'", vm_name);
         return Ok(());
     }
 
     // Stop the VM
     println!("Shutting down project VM '{}'...", vm_name);
-    stop_vm(&vm_name, &libvirt_opts)?;
+
+    let stop_opts = libvirt::stop::LibvirtStopOpts {
+        name: vm_name.to_string(),
+        force: opts.force,
+        timeout: 60,
+    };
+
+    let _ = libvirt::stop::run(&libvirt_opts, stop_opts);
 
     // Remove if requested
     if opts.remove {
         println!("Removing project VM '{}'...", vm_name);
-        remove_vm(&vm_name, &libvirt_opts)?;
+        let rm_opts = libvirt::rm::LibvirtRmOpts {
+            name: vm_name.to_string(),
+            force: opts.force,
+            stop: false,
+        };
+
+        libvirt::rm::run(&libvirt_opts, rm_opts)?
     }
 
     Ok(())
@@ -68,25 +84,3 @@ fn check_vm_exists(name: &str, libvirt_opts: &LibvirtOptions) -> Result<bool> {
 
     Ok(domains.iter().any(|d| d.name == name))
 }
-
-/// Stop a VM
-fn stop_vm(name: &str, libvirt_opts: &LibvirtOptions) -> Result<()> {
-    let stop_opts = libvirt::stop::LibvirtStopOpts {
-        name: name.to_string(),
-        force: false,
-        timeout: 60,
-    };
-
-    libvirt::stop::run(libvirt_opts, stop_opts)
-}
-
-/// Remove a VM
-fn remove_vm(name: &str, libvirt_opts: &LibvirtOptions) -> Result<()> {
-    let rm_opts = libvirt::rm::LibvirtRmOpts {
-        name: name.to_string(),
-        force: false,
-        stop: false,
-    };
-
-    libvirt::rm::run(libvirt_opts, rm_opts)
-}

crates/kit/src/project/up.rs

@@ -219,9 +219,11 @@ fn create_vm(
         extra_smbios_credentials: vec![],
     };
 
-    if let Some(ref fs) = vm.filesystem {
-        run_opts.install.filesystem = Some(fs.clone());
-    }
+    run_opts.install.filesystem = Some(
+        vm.filesystem
+            .clone()
+            .unwrap_or_else(|| crate::libvirt::LIBVIRT_DEFAULT_FILESYSTEM.to_string()),
+    );
 
     // Bind project directory to /run/src read-only with auto-mount
     // (will fall back to read-write if libvirt doesn't support readonly virtiofs)
@@ -233,7 +235,7 @@ fn create_vm(
 
     // Add configured mounts using bind mount options
     for mount in config.mounts.iter().flatten() {
-        let mount_spec = format!("{}:{}", mount.host, mount.guest);
+        let mount_spec = format!("{}/{}:{}", project_dir.as_str(), mount.host, mount.guest);
         let bind_mount = mount_spec
             .parse()
             .with_context(|| format!("Failed to parse mount spec: {}", mount_spec))?;

docs/src/man/bcvk-project-down.md

@@ -21,6 +21,10 @@ Shut down the project VM
 
     Remove the VM after shutting it down
 
+**--force**
+
+    
+
 <!-- END GENERATED OPTIONS -->
 
 # EXAMPLES