Update vhost-device-console

Add tests in vhu_console.rs file, update the control message handling,
apply cargo clippy & fmt recommendations.

Signed-off-by: Timos Ampelikiotis <t.ampelikiotis@virtualopensystems.com>

staging/vhost-device-console/src/backend.rs

@@ -28,8 +28,6 @@ pub(crate) type Result<T> = std::result::Result<T, Error>;
 pub(crate) enum Error {
     #[error("Invalid socket count: {0}")]
     SocketCountInvalid(usize),
-    #[error("Could not create console controller: {0}")]
-    CouldNotCreateConsoleController(crate::console::Error),
     #[error("Could not create console backend: {0}")]
     CouldNotCreateBackend(crate::vhu_console::Error),
     #[error("Could not create daemon: {0}")]
@@ -131,8 +129,7 @@ pub(crate) fn start_backend_server(
     backend: BackendType,
 ) -> Result<()> {
     loop {
-        let controller =
-            ConsoleController::new(backend).map_err(Error::CouldNotCreateConsoleController)?;
+        let controller = ConsoleController::new(backend);
         let arc_controller = Arc::new(RwLock::new(controller));
         let vu_console_backend = Arc::new(RwLock::new(
             VhostUserConsoleBackend::new(arc_controller).map_err(Error::CouldNotCreateBackend)?,
@@ -234,8 +231,8 @@ mod tests {
     fn test_console_valid_configuration_nested() {
         let args = ConsoleArgs {
             socket_path: String::from("/tmp/vhost.sock").into(),
-            backend: BackendType::Nested.into(),
-            tcp_port: String::from("12345").into(),
+            backend: BackendType::Nested,
+            tcp_port: String::from("12345"),
             socket_count: 1,
         };
 
@@ -246,8 +243,8 @@ mod tests {
     fn test_console_invalid_configuration_nested_1() {
         let args = ConsoleArgs {
             socket_path: String::from("/tmp/vhost.sock").into(),
-            backend: BackendType::Nested.into(),
-            tcp_port: String::from("12345").into(),
+            backend: BackendType::Nested,
+            tcp_port: String::from("12345"),
             socket_count: 0,
         };
 
@@ -261,8 +258,8 @@ mod tests {
     fn test_console_invalid_configuration_nested_2() {
         let args = ConsoleArgs {
             socket_path: String::from("/tmp/vhost.sock").into(),
-            backend: BackendType::Nested.into(),
-            tcp_port: String::from("12345").into(),
+            backend: BackendType::Nested,
+            tcp_port: String::from("12345"),
             socket_count: 2,
         };
 
@@ -276,8 +273,8 @@ mod tests {
     fn test_console_valid_configuration_network_1() {
         let args = ConsoleArgs {
             socket_path: String::from("/tmp/vhost.sock").into(),
-            backend: BackendType::Network.into(),
-            tcp_port: String::from("12345").into(),
+            backend: BackendType::Network,
+            tcp_port: String::from("12345"),
             socket_count: 1,
         };
 
@@ -288,8 +285,8 @@ mod tests {
     fn test_console_valid_configuration_network_2() {
         let args = ConsoleArgs {
             socket_path: String::from("/tmp/vhost.sock").into(),
-            backend: BackendType::Network.into(),
-            tcp_port: String::from("12345").into(),
+            backend: BackendType::Network,
+            tcp_port: String::from("12345"),
             socket_count: 2,
         };
 
@@ -307,9 +304,7 @@ mod tests {
             .into_iter()
             .zip(tcp_addrs.iter())
         {
-            let controller = ConsoleController::new(backend)
-                .map_err(Error::CouldNotCreateConsoleController)
-                .expect("Failed create console");
+            let controller = ConsoleController::new(backend);
             let arc_controller = Arc::new(RwLock::new(controller));
             let vu_console_backend = Arc::new(RwLock::new(
                 VhostUserConsoleBackend::new(arc_controller)
@@ -346,8 +341,8 @@ mod tests {
     fn test_start_net_backend_success() {
         let args = ConsoleArgs {
             socket_path: String::from("/tmp/vhost.sock").into(),
-            backend: BackendType::Network.into(),
-            tcp_port: String::from("12345").into(),
+            backend: BackendType::Network,
+            tcp_port: String::from("12345"),
             socket_count: 1,
         };
 
@@ -358,8 +353,8 @@ mod tests {
     fn test_start_nested_backend_success() {
         let args = ConsoleArgs {
             socket_path: String::from("/tmp/vhost.sock").into(),
-            backend: BackendType::Nested.into(),
-            tcp_port: String::from("12345").into(),
+            backend: BackendType::Nested,
+            tcp_port: String::from("12345"),
             socket_count: 1,
         };
 

staging/vhost-device-console/src/console.rs

@@ -10,8 +10,6 @@ use clap::ValueEnum;
 use log::trace;
 use thiserror::Error as ThisError;
 
-type Result<T> = std::result::Result<T, Error>;
-
 #[derive(Copy, Clone, Debug, PartialEq, ThisError)]
 pub(crate) enum Error {}
 
@@ -30,8 +28,8 @@ pub(crate) struct ConsoleController {
 }
 
 impl ConsoleController {
-    pub(crate) fn new(backend: BackendType) -> Result<ConsoleController> {
-        Ok(ConsoleController {
+    pub(crate) fn new(backend: BackendType) -> ConsoleController {
+        ConsoleController {
             config: VirtioConsoleConfig {
                 cols: 20.into(),
                 rows: 20.into(),
@@ -40,7 +38,7 @@ impl ConsoleController {
             },
             backend,
             exit: false,
-        })
+        }
     }
 
     pub(crate) fn config(&self) -> &VirtioConsoleConfig {

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

@@ -5,14 +5,10 @@
 //
 // SPDX-License-Identifier: Apache-2.0 or BSD-3-Clause
 
-#[cfg(target_env = "gnu")]
 mod backend;
-#[cfg(target_env = "gnu")]
 mod console;
-#[cfg(target_env = "gnu")]
 mod vhu_console;
 
-#[cfg(target_env = "gnu")]
 fn main() {
     backend::console_init()
 }