Change Descriptor API

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

Author: uran0sH

Cargo.lock

@@ -21,11 +21,11 @@ env_logger = "0.11"
 epoll = "4.3.2"
 log = "0.4"
 thiserror = "2.0"
-vhost = { version = "0.13", features = ["vhost-user-backend"] }
-vhost-user-backend = "0.17"
+vhost = { path = "../../vhost/vhost", features = ["vhost-user-backend"] }
+vhost-user-backend = { path = "../../vhost/vhost-user-backend"}
 virtio-bindings = "0.2.2"
-virtio-queue = "0.14"
-virtio-vsock = "0.8"
+virtio-queue = { path = "../../vm-virtio/virtio-queue", features = ["test-utils"]}
+virtio-vsock = { path = "../../vm-virtio/virtio-vsock" }
 vm-memory = "0.16.1"
 vmm-sys-util = "0.12"
 figment = { version = "0.10.19", features = ["yaml"] }
@@ -35,5 +35,5 @@ serde = { version = "1", features = ["derive"] }
 
 [dev-dependencies]
 assert_matches = "1.5"
-virtio-queue = { version = "0.14", features = ["test-utils"] }
+virtio-queue = { path = "../../vm-virtio/virtio-queue" }
 tempfile = "3.14.0"

vhost-device-vsock/Cargo.toml

@@ -392,7 +392,7 @@ mod tests {
     use std::ops::Deref;
     use std::sync::{Arc, Mutex};
     use virtio_bindings::bindings::virtio_ring::{VRING_DESC_F_NEXT, VRING_DESC_F_WRITE};
-    use virtio_queue::{mock::MockSplitQueue, Descriptor, DescriptorChain, Queue, QueueOwnedT};
+    use virtio_queue::{mock::MockSplitQueue, desc::Descriptor, desc::split::Descriptor as SplitDescriptor, DescriptorChain, Queue, QueueOwnedT};
     use vm_memory::{
         Address, Bytes, GuestAddress, GuestAddressSpace, GuestMemoryAtomic, GuestMemoryLoadGuard,
         GuestMemoryMmap,
@@ -448,8 +448,8 @@ mod tests {
         // let header = vec![0 as u8; head_params.head_len];
         let header = head_params.construct_head();
         let head_desc =
-            Descriptor::new(next_addr, head_params.head_len as u32, head_flags as u16, 1);
-        mem.write(&header, head_desc.addr()).unwrap();
+            Descriptor::from(SplitDescriptor::new(next_addr, head_params.head_len as u32, head_flags as u16, 1));
+        mem.write(&header, SplitDescriptor::from(head_desc).addr()).unwrap();
         assert!(virt_queue.desc_table().store(0, head_desc).is_ok());
         next_addr += head_params.head_len as u64;
 
@@ -469,8 +469,8 @@ mod tests {
             }
             // vsock data
             let data = vec![0_u8; head_data_len as usize];
-            let data_desc = Descriptor::new(next_addr, data.len() as u32, head_flags as u16, i + 2);
-            mem.write(&data, data_desc.addr()).unwrap();
+            let data_desc = Descriptor::from(SplitDescriptor::new(next_addr, data.len() as u32, head_flags as u16, i + 2));
+            mem.write(&data, SplitDescriptor::from(data_desc).addr()).unwrap();
             assert!(virt_queue.desc_table().store(i + 1, data_desc).is_ok());
             next_addr += head_data_len as u64;
         }