x11: Use muvm-x11bridge instead of x112virtgpu

Signed-off-by: Asahi Lina <[email protected]>

Author: hoshinolina

crates/muvm/src/bin/muvm.rs

@@ -382,6 +382,7 @@ fn main() -> Result<()> {
     );
     env.insert("MUVM_SERVER_COOKIE".to_owned(), cookie.to_string());
 
+    #[cfg(x11bridge)]
     if options.direct_x11 {
         let display =
             env::var("DISPLAY").context("X11 forwarding requested but DISPLAY is unset")?;

crates/muvm/src/cli_options.rs

@@ -111,6 +111,14 @@ pub fn options() -> OptionParser<Options> {
         .help("Use direct X11 forwarding instead of sommelier + XWayland")
         .switch();
 
+    #[cfg(not(feature = "x11bridge"))]
+    let direct_x11 = direct_x11
+        .guard(
+            |x| !*x,
+            "--direct-x11 requires the `x11bridge` crate feature",
+        )
+        .hide();
+
     let command = positional("COMMAND").help("the command you want to execute in the vm");
     let command_args = any::<String, _, _>("COMMAND_ARGS", |arg| {
         (!["--help", "-h"].contains(&&*arg)).then_some(arg)

crates/muvm/src/guest/bin/muvm-guest.rs

@@ -12,6 +12,7 @@ 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;
+#[cfg(feature = "x11bridge")]
 use muvm::guest::x11::setup_x11_forwarding;
 use muvm::utils::env::find_in_path;
 use rustix::process::{getrlimit, setrlimit, Resource};
@@ -79,7 +80,12 @@ fn main() -> Result<()> {
     let pulse_path = pulse_path.join("native");
     setup_socket_proxy(pulse_path, 3333)?;
 
-    if !setup_x11_forwarding(run_path)? {
+    #[cfg(feature = "x11bridge")]
+    let direct_x11 = setup_x11_forwarding(run_path)?;
+    #[cfg(not(feature = "x11bridge"))]
+    let direct_x11 = false;
+
+    if !direct_x11 {
         // Will not return if successful.
         exec_sommelier(&options.command, &options.command_args)
             .context("Failed to execute sommelier")?;

crates/muvm/src/guest/mod.rs

@@ -5,4 +5,5 @@ pub mod net;
 pub mod socket;
 pub mod sommelier;
 pub mod user;
+#[cfg(feature = "x11bridge")]
 pub mod x11;

crates/muvm/src/guest/x11.rs

@@ -7,9 +7,7 @@ use std::process::Command;
 use anyhow::{anyhow, Context, Result};
 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
 
-use super::socket::setup_socket_proxy;
-
-use crate::utils::env::find_in_path;
+use crate::env::find_muvm_exec;
 
 pub fn setup_x11_forwarding<P>(run_path: P) -> Result<bool>
 where
@@ -26,18 +24,10 @@ where
     }
     let host_display = &host_display[1..];
 
-    let x112virtgpu_path =
-        find_in_path("x112virtgpu").context("Failed to check existence of `x112virtgpu`")?;
-
-    if x112virtgpu_path.is_some() {
-        let mut cmd = Command::new(x112virtgpu_path.unwrap());
-        cmd.args(["--listen-display", ":1"]);
+    let mut cmd = Command::new(find_muvm_exec("muvm-x11bridge")?);
+    cmd.args(["--listen-display", ":1"]);
 
-        cmd.spawn().context("Failed to spawn `x112virtgpu`")?;
-    } else {
-        log::error!("x112virtgpu not available, X11 forwarding will operate in socket forwarding mode. This is probably not what you want.");
-        setup_socket_proxy(Path::new("/tmp/.X11-unix/X1"), 6000)?;
-    }
+    cmd.spawn().context("Failed to spawn `muvm-x11bridge`")?;
 
     // SAFETY: Safe if and only if `muvm-guest` program is not multithreaded.
     // See https://doc.rust-lang.org/std/env/fn.set_var.html#safety