build: Bump rust-vmm dependencies

Bump to the released versions that are compatible wherever possible but
for the vhost and vfio crates they are git hashes as no releases with
compatible versions have yet been made.

Signed-off-by: Rob Bradford <rbradford@meta.com>

virtio-devices/src/console.rs

@@ -18,7 +18,7 @@ use serde::{Deserialize, Serialize};
 use serial_buffer::SerialBuffer;
 use thiserror::Error;
 use virtio_queue::{Queue, QueueT};
-use vm_memory::{ByteValued, Bytes, GuestAddressSpace, GuestMemory, GuestMemoryAtomic};
+use vm_memory::{ByteValued, Bytes, GuestAddressSpace, GuestMemoryAtomic};
 use vm_migration::{Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable};
 use vm_virtio::{AccessPlatform, Translatable};
 use vmm_sys_util::eventfd::EventFd;

virtio-devices/src/lib.rs

@@ -168,9 +168,7 @@ pub fn get_host_address_range<M: GuestMemory + ?Sized>(
     if mem.check_range(addr, size) {
         let slice = mem.get_slice(addr, size).unwrap();
         assert!(slice.len() >= size);
-        // TODO: return a VolatileSlice and fix all callers.
-        #[allow(deprecated)]
-        Some(slice.as_ptr())
+        Some(slice.ptr_guard_mut().as_ptr())
     } else {
         None
     }

virtio-devices/src/rng.rs

@@ -17,7 +17,7 @@ use seccompiler::SeccompAction;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use virtio_queue::{Queue, QueueT};
-use vm_memory::{GuestAddressSpace, GuestMemory, GuestMemoryAtomic};
+use vm_memory::{Bytes, GuestAddressSpace, GuestMemoryAtomic};
 use vm_migration::{Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable};
 use vm_virtio::{AccessPlatform, Translatable};
 use vmm_sys_util::eventfd::EventFd;

virtio-devices/src/vhost_user/mod.rs

@@ -17,8 +17,9 @@ use vhost::vhost_user::message::{
 };
 use vhost::vhost_user::{FrontendReqHandler, VhostUserFrontendReqHandler};
 use virtio_queue::{Error as QueueError, Queue};
+use vm_memory::guest_memory::Error as MmapError;
 use vm_memory::mmap::MmapRegionError;
-use vm_memory::{Address, Error as MmapError, GuestAddressSpace, GuestMemory, GuestMemoryAtomic};
+use vm_memory::{Address, GuestAddressSpace, GuestMemory, GuestMemoryAtomic};
 use vm_migration::protocol::MemoryRangeTable;
 use vm_migration::{MigratableError, Snapshot};
 use vmm_sys_util::eventfd::EventFd;

virtio-devices/src/vhost_user/vu_common_ctrl.rs

@@ -21,9 +21,8 @@ use vhost::vhost_user::{
 use vhost::{VhostBackend, VhostUserDirtyLogRegion, VhostUserMemoryRegionInfo, VringConfigData};
 use virtio_queue::desc::RawDescriptor;
 use virtio_queue::{Queue, QueueT};
-use vm_memory::{
-    Address, Error as MmapError, FileOffset, GuestAddress, GuestMemory, GuestMemoryRegion,
-};
+use vm_memory::guest_memory::Error as MmapError;
+use vm_memory::{Address, FileOffset, GuestAddress, GuestMemory, GuestMemoryRegion};
 use vm_migration::protocol::MemoryRangeTable;
 use vmm_sys_util::eventfd::EventFd;
 
@@ -67,7 +66,11 @@ impl VhostUserHandle {
         for region in mem.iter() {
             let (mmap_handle, mmap_offset) = match region.file_offset() {
                 Some(_file_offset) => (_file_offset.file().as_raw_fd(), _file_offset.start()),
-                None => return Err(Error::VhostUserMemoryRegion(MmapError::NoMemoryRegion)),
+                None => {
+                    return Err(Error::VhostUserMemoryRegion(
+                        MmapError::InvalidGuestAddress(region.start_addr()),
+                    ));
+                }
             };
 
             let vhost_user_net_reg = VhostUserMemoryRegionInfo {