Remove unwraps in scmi

A few unwraps which may or may not be needed was replaced
with Result types.

Signed-off-by: Fredrik Simonsson <[email protected]>

Author: Fredrik Simonsson

vhost-device-scmi/src/main.rs

@@ -69,7 +69,10 @@ impl TryFrom<args::ScmiArgs> for VuScmiConfig {
         let device_iterator = cmd_args.device.iter();
         for d in device_iterator {
             let mut split = d.split(',');
-            let name = split.next().unwrap().to_owned();
+            let name = split
+                .next()
+                .ok_or("String split failed with None")?
+                .to_owned();
             let mut properties = vec![];
             for s in split {
                 if let Some((key, value)) = s.split('=').collect_tuple() {
@@ -95,18 +98,21 @@ fn start_backend(config: VuScmiConfig) -> Result<()> {
             return Err(error.to_string());
         }
 
-        let backend = Arc::new(RwLock::new(backend_instance.unwrap()));
+        let backend = Arc::new(RwLock::new(backend_instance.map_err(|e| format!("{e}"))?));
         let mut daemon = VhostUserDaemon::new(
             "vhost-device-scmi".to_owned(),
             backend.clone(),
             GuestMemoryAtomic::new(GuestMemoryMmap::new()),
         )
-        .unwrap();
+        .map_err(|e| format!("{e}"))?;
 
         // Register devices such as "/dev/iio:deviceX" which can actively notify the frontend to epoll the handler.
         // Then once there is data coming from these devices, an event will be created. (device_event=3)
         let handlers = daemon.get_epoll_handlers();
-        backend.read().unwrap().register_device_event_fd(handlers);
+        backend
+            .read()
+            .map_err(|e| format!("{e}"))?
+            .register_device_event_fd(handlers);
 
         daemon
             .serve(&config.socket_path)

vhost-device-scmi/src/vhu_scmi.rs

@@ -512,9 +512,13 @@ impl VhostUserBackendMut for VuScmiBackend {
             _ => {
                 if device_event >= NOTIFY_ALLOW_START_FD && device_event <= max_device_event {
                     let vring = &vrings[EVENT_QUEUE as usize];
-                    vring.disable_notification().unwrap();
+                    vring
+                        .disable_notification()
+                        .map_err(|error: virtio_queue::Error| std::io::Error::other(error))?;
                     self.notify_event_queue(vring, device_event)?;
-                    vring.enable_notification().unwrap();
+                    vring
+                        .enable_notification()
+                        .map_err(|error: virtio_queue::Error| std::io::Error::other(error))?;
                 } else {
                     warn!("unhandled device_event: {}", device_event);
                     return Err(VuScmiError::HandleEventUnknownEvent.into());