build(deps): bump the vhost group across 1 directory with 2 updates

Updates the requirements on [virtio-queue](https://github.com/rust-vmm/vm-virtio) and [vm-memory](https://github.com/rust-vmm/vm-memory) to permit the latest version.

Updates `virtio-queue` to 0.17.0
- [Release notes](https://github.com/rust-vmm/vm-virtio/releases)
- [Commits](https://github.com/rust-vmm/vm-virtio/compare/virtio-queue-v0.16.0...virtio-queue-v0.17.0)

Updates `vm-memory` to 0.17.1
- [Release notes](https://github.com/rust-vmm/vm-memory/releases)
- [Changelog](https://github.com/rust-vmm/vm-memory/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rust-vmm/vm-memory/compare/v0.16.2...v0.17.1)

---
updated-dependencies:
- dependency-name: virtio-queue
  dependency-version: 0.17.0
  dependency-type: direct:production
  dependency-group: vhost
- dependency-name: vm-memory
  dependency-version: 0.17.1
  dependency-type: direct:production
  dependency-group: vhost
...

Signed-off-by: dependabot[bot] <support@github.com>
[SG: adapted code to vm-memory changes, mainly related to changes on
 return types (e.g. Option vs Result, etc.)]
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
This commit is contained in:
dependabot[bot] 2025-11-17 15:27:14 +00:00 committed by Stefano Garzarella
parent 024213c4d6
commit 1d39cf5cbb
3 changed files with 10 additions and 9 deletions

View file

@ -8,6 +8,6 @@ members = [
[workspace.dependencies]
virtio-bindings = "0.2.6"
virtio-queue = "0.16.0"
vm-memory = "0.16.2"
virtio-queue = "0.17.0"
vm-memory = "0.17.1"
vmm-sys-util = "0.15.0"

View file

@ -318,7 +318,9 @@ where
region.mmap_region(file)?,
GuestAddress(region.guest_phys_addr),
)
.map_err(|e| VhostUserError::ReqHandlerError(io::Error::other(e)))?;
.ok_or(VhostUserError::ReqHandlerError(
io::ErrorKind::InvalidInput.into(),
))?;
mappings.push(AddrMapping {
#[cfg(feature = "postcopy")]
local_addr: guest_region.as_ptr() as u64,
@ -606,7 +608,9 @@ where
region.mmap_region(file)?,
GuestAddress(region.guest_phys_addr),
)
.map_err(|e| VhostUserError::ReqHandlerError(io::Error::other(e)))?,
.ok_or(VhostUserError::ReqHandlerError(
io::ErrorKind::InvalidInput.into(),
))?,
);
let addr_mapping = AddrMapping {

View file

@ -17,7 +17,7 @@ use std::ops::Deref;
use uuid::Uuid;
use vm_memory::{mmap::NewBitmap, ByteValued, Error as MmapError, FileOffset, MmapRegion};
use vm_memory::{mmap::NewBitmap, ByteValued, FileOffset, MmapRegion};
#[cfg(feature = "xen")]
use vm_memory::{GuestAddress, MmapRange, MmapXenFlags};
@ -550,7 +550,6 @@ impl VhostUserMemoryRegion {
FileOffset::new(file, self.mmap_offset),
self.memory_size as usize,
)
.map_err(MmapError::MmapRegion)
.map_err(|e| Error::ReqHandlerError(io::Error::other(e)))
}
@ -590,9 +589,7 @@ impl VhostUserMemoryRegion {
self.xen_mmap_data,
);
MmapRegion::<B>::from_range(range)
.map_err(MmapError::MmapRegion)
.map_err(|e| Error::ReqHandlerError(io::Error::other(e)))
MmapRegion::<B>::from_range(range).map_err(|e| Error::ReqHandlerError(io::Error::other(e)))
}
fn is_valid(&self) -> bool {