chore: bump virtio-queue and some related dependencies

virtio-queue v0.15 introduces a new Descriptor API supporting both
split and packed virtqueue.
Update our dependencies and code to work with the new version
of the crate, including updating vhost-user-backend and virtio-vsock.

Updates `vhost-user-backend` from 0.18.0 to 0.19.0
- [Release notes](https://github.com/rust-vmm/vhost/releases)
- [Commits](rust-vmm/[email protected])

Updates `virtio-queue` from 0.14.0 to 0.15.0
- [Release notes](https://github.com/rust-vmm/vm-virtio/releases)
- [Commits](rust-vmm/[email protected])

Updates `virtio-vsock` from 0.8.0 to 0.9.0
- [Release notes](https://github.com/rust-vmm/vm-virtio/releases)
- [Commits](rust-vmm/[email protected])

Signed-off-by: Wenyu Huang <[email protected]>

Author: uran0sH

Cargo.lock

@@ -27,9 +27,9 @@ libc = "0.2.172"
 thiserror = "2.0"
 futures-executor = { version = "0.3", features = ["thread-pool"] }
 vhost = { version = "0.14", features = ["vhost-user-backend"] }
-vhost-user-backend = "0.18"
+vhost-user-backend = "0.19"
 virtio-bindings = "0.2.5"
-virtio-queue = "0.14"
+virtio-queue = "0.15"
 vm-memory = "0.16.0"
 vmm-sys-util = "0.14"
 v4l2r = { git =  "https://github.com/Gnurou/v4l2r", rev = "110fd77", optional = true }
@@ -38,5 +38,5 @@ v4l2r = { git =  "https://github.com/Gnurou/v4l2r", rev = "110fd77", optional =
 assert_matches = "1.5"
 rstest = "0.25.0"
 tempfile = "3.20.0"
-virtio-queue = { version = "0.14", features = ["test-utils"] }
+virtio-queue = { version = "0.15", features = ["test-utils"] }
 vm-memory = { version = "0.16.0", features = ["backend-mmap", "backend-atomic"] }

staging/Cargo.lock

@@ -11,7 +11,7 @@ use std::{
 use futures_executor::{ThreadPool, ThreadPoolBuilder};
 use log::{debug, warn};
 use vhost_user_backend::{VringEpollHandler, VringRwLock, VringT};
-use virtio_queue::{Descriptor, QueueOwnedT};
+use virtio_queue::{desc::split::Descriptor as SplitDescriptor, QueueOwnedT};
 use vm_memory::{
     ByteValued, Bytes, GuestAddress, GuestAddressSpace, GuestMemory, GuestMemoryAtomic,
     GuestMemoryMmap,
@@ -198,7 +198,7 @@ pub(crate) struct VhostUserVideoThread {
 
 fn write_descriptor_data<T: ToBytes>(
     resp: T,
-    desc_response: &Descriptor,
+    desc_response: &SplitDescriptor,
     desc_chain: &VideoDescriptorChain,
     vring: &VringRwLock,
 ) {
@@ -577,7 +577,7 @@ mod tests {
     use rstest::*;
     use tempfile::TempDir;
     use virtio_bindings::virtio_ring::{VRING_DESC_F_NEXT, VRING_DESC_F_WRITE};
-    use virtio_queue::{mock::MockSplitQueue, Queue};
+    use virtio_queue::{desc::RawDescriptor, mock::MockSplitQueue, Queue};
     use vm_memory::{Address, GuestAddress};
     use vmm_sys_util::eventfd::EventFd;
 
@@ -605,14 +605,18 @@ mod tests {
 
         // Descriptor for the video request
         let desc_request =
-            Descriptor::new(next_addr, request_size, VRING_DESC_F_NEXT as u16, index + 1);
+            SplitDescriptor::new(next_addr, request_size, VRING_DESC_F_NEXT as u16, index + 1);
         mem.write_slice(request, desc_request.addr()).unwrap();
-        vq.desc_table().store(index, desc_request).unwrap();
+        vq.desc_table()
+            .store(index, RawDescriptor::from(desc_request))
+            .unwrap();
         next_addr += u64::from(desc_request.len());
         index += 1;
         // Descriptor for the video response
-        let desc_response = Descriptor::new(next_addr, 0x100, VRING_DESC_F_WRITE as u16, 0);
-        vq.desc_table().store(index, desc_response).unwrap();
+        let desc_response = SplitDescriptor::new(next_addr, 0x100, VRING_DESC_F_WRITE as u16, 0);
+        vq.desc_table()
+            .store(index, RawDescriptor::from(desc_response))
+            .unwrap();
 
         // Put the descriptor index 0 in the first available ring position.
         mem.write_obj(0u16, vq.avail_addr().unchecked_add(4))

staging/vhost-device-video/Cargo.toml

@@ -946,7 +946,11 @@ impl ToBytes for virtio_video_event {
 pub mod tests {
     use assert_matches::assert_matches;
     use rstest::*;
-    use virtio_queue::{mock::MockSplitQueue, Descriptor, Queue, QueueOwnedT};
+    use virtio_queue::{
+        desc::{split::Descriptor as SplitDescriptor, RawDescriptor},
+        mock::MockSplitQueue,
+        Queue, QueueOwnedT,
+    };
     use vm_memory::{
         Address, Bytes, GuestAddress, GuestAddressSpace, GuestMemoryAtomic, GuestMemoryMmap,
     };
@@ -961,9 +965,12 @@ pub mod tests {
         let flags = 0;
 
         let request = request.as_slice();
-        let desc = Descriptor::new(addr, request.len() as u32, flags as u16, 1);
+        let desc = SplitDescriptor::new(addr, request.len() as u32, flags as u16, 1);
         mem.write(request, desc.addr()).unwrap();
-        assert!(virt_queue.desc_table().store(0, desc).is_ok());
+        assert!(virt_queue
+            .desc_table()
+            .store(0, RawDescriptor::from(desc))
+            .is_ok());
 
         // Put the descriptor index 0 in the first available ring position.
         mem.write_obj(0u16, virt_queue.avail_addr().unchecked_add(4))

staging/vhost-device-video/src/vhu_video_thread.rs

@@ -22,13 +22,13 @@ thiserror = "2.0"
 queues = "1.0.2"
 socketcan = "3.5.0"
 vhost = { version = "0.14", features = ["vhost-user-backend"] }
-vhost-user-backend = "0.18"
+vhost-user-backend = "0.19"
 virtio-bindings = "0.2.5"
-virtio-queue = "0.14"
+virtio-queue = "0.15"
 vm-memory = "0.16.1"
 vmm-sys-util = "0.14"
 
 [dev-dependencies]
 assert_matches = "1.5"
-virtio-queue = { version = "0.14", features = ["test-utils"] }
+virtio-queue = { version = "0.15", features = ["test-utils"] }
 vm-memory = { version = "0.16.1", features = ["backend-mmap", "backend-atomic"] }