Minor changes for studychao's comments

- Errors have net device type and name. - Formating the import blocks of "vmm_comm_trait.rs". Signed-off-by: Xuewei Niu <[email protected]>
openanolis · Nov 23, 2023 · d2637b3 · d2637b3
1 parent 6a4fb7a
commit d2637b3
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 16 deletions.
diff --git a/src/api_server.rs b/src/api_server.rs
@@ -16,6 +16,7 @@ use dragonball::vcpu::VcpuResizeInfo;
 use serde_json::Value;
 use vmm_sys_util::eventfd::EventFd;
 
+use crate::utils;
 use crate::vmm_comm_trait::VMMComm;
 
 pub struct ApiServer {
@@ -87,8 +88,12 @@ impl ApiServer {
                 let configs: Vec<NetworkInterfaceConfig> = serde_json::from_str(config_json)
                     .context("Parse NetworkInterfaceConfig from JSON")?;
                 for config in configs.iter() {
-                    self.insert_virnet(config.clone())
-                        .context("Insert a virtio device to the Dragonball")?;
+                    self.insert_virnet(config.clone()).with_context(|| {
+                        format!(
+                            "Insert a {} device to the Dragonball",
+                            utils::net_device_name(config)
+                        )
+                    })?;
                 }
             }
             Some("insert_virblks") => {

diff --git a/src/utils.rs b/src/utils.rs
@@ -1,3 +1,4 @@
+use dragonball::api::v1::NetworkInterfaceConfig;
 use slog::Drain;
 use slog::*;
 use slog_scope::set_global_logger;
@@ -25,3 +26,16 @@ pub fn setup_db_log(log_file_path: &String, log_level: &str) {
     guard.cancel_reset();
     slog_stdlog::init().unwrap();
 }
+
+#[inline]
+/// Get net device name from `NetworkInterfaceConfig`.
+pub(crate) fn net_device_name(config: &NetworkInterfaceConfig) -> String {
+    match &config.backend {
+        dragonball::api::v1::Backend::Virtio(config) => {
+            format!("virtio-net({})", config.host_dev_name)
+        }
+        dragonball::api::v1::Backend::Vhost(config) => {
+            format!("vhost-net({})", config.host_dev_name)
+        }
+    }
+}
diff --git a/src/vmm_comm_trait.rs b/src/vmm_comm_trait.rs
@@ -1,18 +1,17 @@
-use crossbeam_channel::{Receiver, Sender};
-use vmm_sys_util::eventfd::EventFd;
-
-use anyhow::{anyhow, Context, Result};
 use std::sync::{Arc, Mutex};
 
-use dragonball::{
-    api::v1::{
-        BlockDeviceConfigInfo, BootSourceConfig, NetworkInterfaceConfig, VmmAction, VmmActionError,
-        VmmData, VmmRequest, VmmResponse, VsockDeviceConfigInfo,
-    },
-    device_manager::fs_dev_mgr::{FsDeviceConfigInfo, FsMountConfigInfo},
-    vcpu::VcpuResizeInfo,
-    vm::VmConfigInfo,
+use anyhow::{anyhow, Context, Result};
+use crossbeam_channel::{Receiver, Sender};
+use dragonball::api::v1::{
+    BlockDeviceConfigInfo, BootSourceConfig, NetworkInterfaceConfig, VmmAction, VmmActionError,
+    VmmData, VmmRequest, VmmResponse, VsockDeviceConfigInfo,
 };
+use dragonball::device_manager::fs_dev_mgr::{FsDeviceConfigInfo, FsMountConfigInfo};
+use dragonball::vcpu::VcpuResizeInfo;
+use dragonball::vm::VmConfigInfo;
+use vmm_sys_util::eventfd::EventFd;
+
+use crate::utils;
 
 pub enum Request {
     Sync(VmmAction),
@@ -135,8 +134,15 @@ pub trait VMMComm {
     }
 
     fn insert_virnet(&self, config: NetworkInterfaceConfig) -> Result<()> {
-        self.handle_request(Request::Sync(VmmAction::InsertNetworkDevice(config)))
-            .context("Request to insert a virtio device")?;
+        self.handle_request(Request::Sync(VmmAction::InsertNetworkDevice(
+            config.clone(),
+        )))
+        .with_context(|| {
+            format!(
+                "Request to insert a {} device",
+                utils::net_device_name(&config)
+            )
+        })?;
         Ok(())
     }