Prepare for renaming the project to muvm

krun was already used by crun for running containers with virtualization
isolated powered by libkrun. To avoid confusing, let's rename this one
to muvm.

Signed-off-by: Sergio Lopez <[email protected]>

Author: slp

Cargo.lock

@@ -1,16 +1,16 @@
-# krun - run programs from your system in a microVM
+# muvm - run programs from your system in a microVM
 
-`krun` allows you to run arbitrary programs from your system in a microVM. It's comprised of two small programs:
+`muvm` allows you to run arbitrary programs from your system in a microVM. It's comprised of three small programs:
 
-- `krun`: links against [libkrun](https://github.com/containers/libkrun) to create the microVM.
+- `muvm`: links against [libkrun](https://github.com/containers/libkrun) to create the microVM.
 
-- `krun-guest`: acts as an entrypoint inside the microVM to set up the environment for running your program.
+- `muvm-guest`: acts as an entrypoint inside the microVM to set up the environment for running your program.
 
 ## Using
 
 ``` sh
 
-Usage: krun [OPTIONS] COMMAND [COMMAND_ARGS...]
+Usage: muvm [OPTIONS] COMMAND [COMMAND_ARGS...]
 OPTIONS:
         -h    --help                Show help
               --net=NET_MODE        Set network mode
@@ -23,13 +23,13 @@ COMMAND_ARGS: arguments of COMMAND
 
 ## Running graphical applications
 
-If [sommelier](https://chromium.googlesource.com/chromiumos/platform2/+/master/vm_tools/sommelier) is installed in your system, `krun` will use it to connect to the Wayland session on the hosts, allowing you to run graphical applications in the microVM.
+If [sommelier](https://chromium.googlesource.com/chromiumos/platform2/+/master/vm_tools/sommelier) is installed in your system, `muvm` will use it to connect to the Wayland session on the hosts, allowing you to run graphical applications in the microVM.
 
 GPU acceleration is also enabled on systems supporting [DRM native context](https://indico.freedesktop.org/event/2/contributions/53/attachments/76/121/XDC2022_%20virtgpu%20drm%20native%20context.pdf) (freedreno, amdgpu, asahi).
 
 ## Running x86/x86_64 on aarch64
 
-If [FEX-Emu](https://fex-emu.com/) is installed in your system, `krun` will configure `binfmt_misc` inside the microVM so x86/x86_64 programs can be run transparently on it.
+If [FEX-Emu](https://fex-emu.com/) is installed in your system, `muvm` will configure `binfmt_misc` inside the microVM so x86/x86_64 programs can be run transparently on it.
 
 ## Motivation
 

README.md

@@ -1,11 +1,11 @@
 [package]
-name = "krun"
+name = "muvm"
 version = "0.1.0"
 authors = ["Sergio Lopez <[email protected]>", "Teoh Han Hui <[email protected]>"]
 edition = "2021"
 rust-version = "1.77.0"
 description = "Run programs from your system in a microVM"
-repository = "https://github.com/slp/krun"
+repository = "https://github.com/AsahiLinux/muvm"
 license = "MIT"
 
 [dependencies]
@@ -28,13 +28,13 @@ uuid = { version = "1.10.0", default-features = false, features = ["std", "v7"]
 default = []
 
 [[bin]]
-name = "krun"
-path = "src/bin/krun.rs"
+name = "muvm"
+path = "src/bin/muvm.rs"
 
 [[bin]]
-name = "krun-guest"
-path = "src/guest/bin/krun-guest.rs"
+name = "muvm-guest"
+path = "src/guest/bin/muvm-guest.rs"
 
 [[bin]]
-name = "krun-server"
-path = "src/server/bin/krun-server.rs"
+name = "muvm-server"
+path = "src/server/bin/muvm-server.rs"

crates/krun/Cargo.toml crates/muvm/Cargo.tomlcrates/krun/Cargo.toml renamed to crates/muvm/Cargo.toml

@@ -5,19 +5,19 @@ use std::os::fd::{IntoRawFd, OwnedFd};
 use std::path::Path;
 
 use anyhow::{anyhow, Context, Result};
-use krun::cli_options::options;
-use krun::cpu::{get_fallback_cores, get_performance_cores};
-use krun::env::{find_krun_exec, prepare_env_vars};
-use krun::launch::{launch_or_lock, LaunchResult};
-use krun::net::{connect_to_passt, start_passt};
-use krun::types::MiB;
 use krun_sys::{
     krun_add_disk, krun_add_vsock_port, krun_create_ctx, krun_set_env, krun_set_gpu_options2,
     krun_set_log_level, krun_set_passt_fd, krun_set_root, krun_set_vm_config, krun_set_workdir,
     krun_start_enter, VIRGLRENDERER_DRM, VIRGLRENDERER_THREAD_SYNC,
     VIRGLRENDERER_USE_ASYNC_FENCE_CB, VIRGLRENDERER_USE_EGL,
 };
 use log::debug;
+use muvm::cli_options::options;
+use muvm::cpu::{get_fallback_cores, get_performance_cores};
+use muvm::env::{find_muvm_exec, prepare_env_vars};
+use muvm::launch::{launch_or_lock, LaunchResult};
+use muvm::net::{connect_to_passt, start_passt};
+use muvm::types::MiB;
 use nix::sys::sysinfo::sysinfo;
 use nix::unistd::User;
 use rustix::io::Errno;
@@ -74,7 +74,7 @@ fn main() -> Result<()> {
         options.env,
     )? {
         LaunchResult::LaunchRequested => {
-            // There was a krun instance already running and we've requested it
+            // There was a muvm instance already running and we've requested it
             // to launch the command successfully, so all the work is done.
             return Ok(());
         },
@@ -337,35 +337,35 @@ fn main() -> Result<()> {
         }
     }
 
-    let krun_guest_path = find_krun_exec("krun-guest")?;
-    let krun_server_path = find_krun_exec("krun-server")?;
+    let muvm_guest_path = find_muvm_exec("muvm-guest")?;
+    let muvm_server_path = find_muvm_exec("muvm-server")?;
 
-    let mut krun_guest_args: Vec<String> = vec![
-        krun_guest_path,
+    let mut muvm_guest_args: Vec<String> = vec![
+        muvm_guest_path,
         username,
         format!("{uid}", uid = getuid().as_raw()),
         format!("{gid}", gid = getgid().as_raw()),
-        krun_server_path,
+        muvm_server_path,
         command
             .to_str()
             .context("Failed to process command as it contains invalid UTF-8")?
             .to_string(),
     ];
     for arg in command_args {
-        krun_guest_args.push(arg);
+        muvm_guest_args.push(arg);
     }
 
     let mut env = prepare_env_vars(env).context("Failed to prepare environment variables")?;
     env.insert(
-        "KRUN_SERVER_PORT".to_owned(),
+        "MUVM_SERVER_PORT".to_owned(),
         options.server_port.to_string(),
     );
 
     let mut krun_config = KrunConfig {
         args: Vec::new(),
         envs: Vec::new(),
     };
-    for arg in krun_guest_args {
+    for arg in muvm_guest_args {
         krun_config.args.push(arg);
     }
     for (key, value) in env {

crates/krun/LICENSE crates/muvm/LICENSEcrates/krun/LICENSE renamed to crates/muvm/LICENSE

@@ -14,7 +14,7 @@ const WELL_KNOWN_ENV_VARS: [&str; 5] = [
     "LD_LIBRARY_PATH",
     "LIBGL_DRIVERS_PATH",
     "MESA_LOADER_DRIVER_OVERRIDE", // needed for asahi
-    "PATH",                        // needed by `krun-guest` program
+    "PATH",                        // needed by `muvm-guest` program
     "RUST_LOG",
 ];
 
@@ -65,13 +65,13 @@ pub fn prepare_env_vars(env: Vec<(String, Option<String>)>) -> Result<HashMap<St
     }
 
     // If we have an X11 display in the host, set HOST_DISPLAY in the guest.
-    // krun-guest will then use this to set up xauth and replace it with :1
+    // muvm-guest will then use this to set up xauth and replace it with :1
     // (which is forwarded to the host display).
     if let Ok(display) = env::var("DISPLAY") {
         env_map.insert("HOST_DISPLAY".to_string(), display);
 
         // And forward XAUTHORITY. This will be modified to fix the
-        // display name in krun-guest.
+        // display name in muvm-guest.
         if let Ok(xauthority) = env::var("XAUTHORITY") {
             env_map.insert("XAUTHORITY".to_string(), xauthority);
         }
@@ -82,7 +82,7 @@ pub fn prepare_env_vars(env: Vec<(String, Option<String>)>) -> Result<HashMap<St
     Ok(env_map)
 }
 
-pub fn find_krun_exec<P>(program: P) -> Result<String>
+pub fn find_muvm_exec<P>(program: P) -> Result<String>
 where
     P: AsRef<Path>,
 {

crates/krun/src/bin/krun.rs crates/muvm/src/bin/muvm.rscrates/krun/src/bin/krun.rs renamed to crates/muvm/src/bin/muvm.rs

@@ -3,16 +3,16 @@ use std::os::unix::process::CommandExt as _;
 use std::process::Command;
 
 use anyhow::{Context, Result};
-use krun::guest::cli_options::options;
-use krun::guest::fex::setup_fex;
-use krun::guest::mount::mount_filesystems;
-use krun::guest::net::configure_network;
-use krun::guest::socket::setup_socket_proxy;
-use krun::guest::sommelier::exec_sommelier;
-use krun::guest::user::setup_user;
-use krun::guest::x11::setup_x11_forwarding;
-use krun::utils::env::find_in_path;
 use log::debug;
+use muvm::guest::cli_options::options;
+use muvm::guest::fex::setup_fex;
+use muvm::guest::mount::mount_filesystems;
+use muvm::guest::net::configure_network;
+use muvm::guest::socket::setup_socket_proxy;
+use muvm::guest::sommelier::exec_sommelier;
+use muvm::guest::user::setup_user;
+use muvm::guest::x11::setup_x11_forwarding;
+use muvm::utils::env::find_in_path;
 use rustix::process::{getrlimit, setrlimit, Resource};
 
 fn main() -> Result<()> {