gpu: remove CI workarounds

Remove the workaround to disable compiling the code on non-gnu targets.
(the CI now doesn't attempt compiling on musl)

Signed-off-by: Matej Hrica <mhrica@redhat.com>

staging/vhost-device-gpu/src/lib.rs

@@ -35,11 +35,8 @@
     clippy::significant_drop_tightening
 )]
 
-#[cfg(target_env = "gnu")]
 pub mod device;
-#[cfg(target_env = "gnu")]
 pub mod protocol;
-#[cfg(target_env = "gnu")]
 pub mod virtio_gpu;
 
 use std::path::{Path, PathBuf};

staging/vhost-device-gpu/src/main.rs

@@ -4,92 +4,76 @@
 //
 // SPDX-License-Identifier: Apache-2.0 or BSD-3-Clause
 
-// Rust vmm container (https://github.com/rust-vmm/rust-vmm-container) doesn't
-// have tools to do a musl build at the moment, and adding that support is
-// tricky as well to the container. Skip musl builds until the time pre-built
-// rutabaga library is available for musl.
-#[cfg(target_env = "gnu")]
-pub mod gnu_main {
-    use std::{path::PathBuf, process::exit};
+use std::{path::PathBuf, process::exit};
 
-    use clap::Parser;
-    use log::{error, info};
-    use thiserror::Error as ThisError;
-    use vhost_device_gpu::{
-        device::{self, VhostUserGpuBackend},
-        GpuConfig, GpuMode,
-    };
-    use vhost_user_backend::VhostUserDaemon;
-    use vm_memory::{GuestMemoryAtomic, GuestMemoryMmap};
+use clap::Parser;
+use log::{error, info};
+use thiserror::Error as ThisError;
+use vhost_device_gpu::{
+    device::{self, VhostUserGpuBackend},
+    GpuConfig, GpuMode,
+};
+use vhost_user_backend::VhostUserDaemon;
+use vm_memory::{GuestMemoryAtomic, GuestMemoryMmap};
 
-    type Result<T> = std::result::Result<T, Error>;
+type Result<T> = std::result::Result<T, Error>;
 
-    #[derive(Debug, ThisError)]
-    pub enum Error {
-        #[error("Could not create backend: {0}")]
-        CouldNotCreateBackend(device::Error),
-        #[error("Could not create daemon: {0}")]
-        CouldNotCreateDaemon(vhost_user_backend::Error),
-        #[error("Fatal error: {0}")]
-        ServeFailed(vhost_user_backend::Error),
-    }
+#[derive(Debug, ThisError)]
+pub enum Error {
+    #[error("Could not create backend: {0}")]
+    CouldNotCreateBackend(device::Error),
+    #[error("Could not create daemon: {0}")]
+    CouldNotCreateDaemon(vhost_user_backend::Error),
+    #[error("Fatal error: {0}")]
+    ServeFailed(vhost_user_backend::Error),
+}
 
-    #[derive(Parser, Debug)]
-    #[clap(author, version, about, long_about = None)]
-    pub struct GpuArgs {
-        /// vhost-user Unix domain socket.
-        #[clap(short, long, value_name = "SOCKET")]
-        pub socket_path: PathBuf,
-        #[clap(short, long, value_enum)]
-        pub gpu_mode: GpuMode,
-    }
+#[derive(Parser, Debug)]
+#[clap(author, version, about, long_about = None)]
+pub struct GpuArgs {
+    /// vhost-user Unix domain socket.
+    #[clap(short, long, value_name = "SOCKET")]
+    pub socket_path: PathBuf,
+    #[clap(short, long, value_enum)]
+    pub gpu_mode: GpuMode,
+}
 
-    impl From<GpuArgs> for GpuConfig {
-        fn from(args: GpuArgs) -> Self {
-            let socket_path = args.socket_path;
-            let gpu_mode: GpuMode = args.gpu_mode;
+impl From<GpuArgs> for GpuConfig {
+    fn from(args: GpuArgs) -> Self {
+        let socket_path = args.socket_path;
+        let gpu_mode: GpuMode = args.gpu_mode;
 
-            GpuConfig::new(socket_path, gpu_mode)
-        }
-    }
-
-    pub fn start_backend(config: &GpuConfig) -> Result<()> {
-        info!("Starting backend");
-        let socket = config.socket_path();
-        let backend = VhostUserGpuBackend::new(config).map_err(Error::CouldNotCreateBackend)?;
-
-        let mut daemon = VhostUserDaemon::new(
-            "vhost-device-gpu-backend".to_string(),
-            backend.clone(),
-            GuestMemoryAtomic::new(GuestMemoryMmap::new()),
-        )
-        .map_err(Error::CouldNotCreateDaemon)?;
-
-        backend.set_epoll_handler(&daemon.get_epoll_handlers());
-
-        daemon.serve(socket).map_err(Error::ServeFailed)?;
-        Ok(())
-    }
-
-    pub fn main() {
-        env_logger::init();
-
-        if let Err(e) = start_backend(&GpuConfig::from(GpuArgs::parse())) {
-            error!("{e}");
-            exit(1);
-        }
+        GpuConfig::new(socket_path, gpu_mode)
     }
 }
 
-#[cfg(target_env = "gnu")]
+pub fn start_backend(config: &GpuConfig) -> Result<()> {
+    info!("Starting backend");
+    let socket = config.socket_path();
+    let backend = VhostUserGpuBackend::new(config).map_err(Error::CouldNotCreateBackend)?;
+
+    let mut daemon = VhostUserDaemon::new(
+        "vhost-device-gpu-backend".to_string(),
+        backend.clone(),
+        GuestMemoryAtomic::new(GuestMemoryMmap::new()),
+    )
+    .map_err(Error::CouldNotCreateDaemon)?;
+
+    backend.set_epoll_handler(&daemon.get_epoll_handlers());
+
+    daemon.serve(socket).map_err(Error::ServeFailed)?;
+    Ok(())
+}
+
 fn main() {
-    gnu_main::main();
+    env_logger::init();
+
+    if let Err(e) = start_backend(&GpuConfig::from(GpuArgs::parse())) {
+        error!("{e}");
+        exit(1);
+    }
 }
 
-#[cfg(target_env = "musl")]
-fn main() {}
-
-#[cfg(target_env = "gnu")]
 #[cfg(test)]
 mod tests {
     use std::path::Path;
@@ -98,7 +82,7 @@ mod tests {
     use tempfile::tempdir;
     use vhost_device_gpu::{GpuConfig, GpuMode};
 
-    use super::gnu_main::{start_backend, Error, GpuArgs};
+    use super::{start_backend, Error, GpuArgs};
 
     impl GpuArgs {
         pub(crate) fn from_args(path: &Path) -> Self {