Merge branch 'rust-vmm:main' into main

Author: prakash-shekhar

vhost-user-backend/src/bitmap.rs

@@ -87,7 +87,7 @@ impl Bitmap for BitmapMmapRegion {
             .is_some_and(|bitmap| bitmap.dirty_at(self.base_address.saturating_add(offset)))
     }
 
-    fn slice_at(&self, offset: usize) -> <Self as WithBitmapSlice>::S {
+    fn slice_at(&self, offset: usize) -> <Self as WithBitmapSlice<'_>>::S {
         Self {
             inner: Arc::clone(&self.inner),
             base_address: self.base_address.saturating_add(offset),

vhost-user-backend/src/vring.rs

@@ -275,7 +275,7 @@ pub struct VringMutex<M: GuestAddressSpace = GuestMemoryAtomic<GuestMemoryMmap>>
 
 impl<M: GuestAddressSpace> VringMutex<M> {
     /// Get a mutable guard to the underlying raw `VringState` object.
-    fn lock(&self) -> MutexGuard<VringState<M>> {
+    fn lock(&self) -> MutexGuard<'_, VringState<M>> {
         self.state.lock().unwrap()
     }
 }
@@ -295,11 +295,11 @@ impl<M: 'static + GuestAddressSpace> VringT<M> for VringMutex<M> {
         })
     }
 
-    fn get_ref(&self) -> <Self as VringStateGuard<M>>::G {
+    fn get_ref(&self) -> <Self as VringStateGuard<'_, M>>::G {
         self.state.lock().unwrap()
     }
 
-    fn get_mut(&self) -> <Self as VringStateMutGuard<M>>::G {
+    fn get_mut(&self) -> <Self as VringStateMutGuard<'_, M>>::G {
         self.lock()
     }
 
@@ -390,7 +390,7 @@ pub struct VringRwLock<M: GuestAddressSpace = GuestMemoryAtomic<GuestMemoryMmap>
 
 impl<M: GuestAddressSpace> VringRwLock<M> {
     /// Get a mutable guard to the underlying raw `VringState` object.
-    fn write_lock(&self) -> RwLockWriteGuard<VringState<M>> {
+    fn write_lock(&self) -> RwLockWriteGuard<'_, VringState<M>> {
         self.state.write().unwrap()
     }
 }
@@ -410,11 +410,11 @@ impl<M: 'static + GuestAddressSpace> VringT<M> for VringRwLock<M> {
         })
     }
 
-    fn get_ref(&self) -> <Self as VringStateGuard<M>>::G {
+    fn get_ref(&self) -> <Self as VringStateGuard<'_, M>>::G {
         self.state.read().unwrap()
     }
 
-    fn get_mut(&self) -> <Self as VringStateMutGuard<M>>::G {
+    fn get_mut(&self) -> <Self as VringStateMutGuard<'_, M>>::G {
         self.write_lock()
     }
 

vhost/src/vhost_user/backend_req.rs

@@ -97,7 +97,7 @@ impl Backend {
         }
     }
 
-    fn node(&self) -> MutexGuard<BackendInternal> {
+    fn node(&self) -> MutexGuard<'_, BackendInternal> {
         self.node.lock().unwrap()
     }
 

vhost/src/vhost_user/gpu_backend_req.rs

@@ -117,7 +117,7 @@ impl GpuBackend {
         }
     }
 
-    fn node(&self) -> MutexGuard<BackendInternal> {
+    fn node(&self) -> MutexGuard<'_, BackendInternal> {
         self.node.lock().unwrap()
     }
 

vhost/src/vhost_user/mod.rs

@@ -96,7 +96,7 @@ pub enum Error {
     /// memfd file creation error
     MemFdCreateError,
     /// File truncate error
-    FileTrucateError,
+    FileTruncateError,
     /// memfd file seal errors
     MemFdSealError,
 }
@@ -126,8 +126,8 @@ impl std::fmt::Display for Error {
             Error::MemFdCreateError => {
                 write!(f, "handler failed to allocate memfd during get_inflight_fd")
             }
-            Error::FileTrucateError => {
-                write!(f, "handler failed to trucate memfd during get_inflight_fd")
+            Error::FileTruncateError => {
+                write!(f, "handler failed to truncate memfd during get_inflight_fd")
             }
             Error::MemFdSealError => write!(
                 f,
@@ -161,7 +161,7 @@ impl Error {
             Error::SocketError(_) | Error::SocketConnect(_) => false,
             Error::FeatureMismatch => false,
             Error::ReqHandlerError(_) => false,
-            Error::MemFdCreateError | Error::FileTrucateError | Error::MemFdSealError => false,
+            Error::MemFdCreateError | Error::FileTruncateError | Error::MemFdSealError => false,
         }
     }
 }