From eca6609dbb727c63a2e09eef295226bf467c7b64 Mon Sep 17 00:00:00 2001
From: Wei Liu <liuwe@microsoft.com>
Date: Wed, 20 Jul 2022 19:16:19 +0000
Subject: [PATCH] hypervisor: mshv: create_device returns DeviceFd directly

This aligns with KVM's code. No functional change.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
---
 hypervisor/src/mshv/mod.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/hypervisor/src/mshv/mod.rs b/hypervisor/src/mshv/mod.rs
index 170ce4045..bea441977 100644
--- a/hypervisor/src/mshv/mod.rs
+++ b/hypervisor/src/mshv/mod.rs
@@ -918,12 +918,12 @@ impl MshvVm {
     /// Creates an in-kernel device.
     ///
     /// See the documentation for `MSHV_CREATE_DEVICE`.
-    fn create_device(&self, device: &mut CreateDevice) -> vm::Result<Arc<dyn device::Device>> {
+    fn create_device(&self, device: &mut CreateDevice) -> vm::Result<DeviceFd> {
         let device_fd = self
             .fd
             .create_device(device)
             .map_err(|e| vm::HypervisorVmError::CreateDevice(e.into()))?;
-        Ok(Arc::new(device_fd))
+        Ok(device_fd)
     }
 }
 
@@ -1117,8 +1117,9 @@ impl vm::Vm for MshvVm {
             flags: 0,
         };
 
-        self.create_device(&mut vfio_dev)
-            .map_err(|e| vm::HypervisorVmError::CreatePassthroughDevice(e.into()))
+        Ok(Arc::new(self.create_device(&mut vfio_dev).map_err(
+            |e| vm::HypervisorVmError::CreatePassthroughDevice(e.into()),
+        )?))
     }
 
     ///