[RFC] vhost-device-vsock: use Reader/Writer

Cargo.toml

@@ -24,7 +24,7 @@ vhost = { version = "0.15", features = ["vhost-user-backend"] }
 vhost-user-backend = "0.21"
 virtio-bindings = "0.2.5"
 virtio-queue = "0.17"
-vm-memory = "0.17.1"
+vm-memory = "0.18"
 vmm-sys-util = "0.15"
 
 [workspace.lints.rust]
@@ -63,3 +63,9 @@ missing_safety_doc = "deny"
 undocumented_unsafe_blocks = "deny"
 option_if_let_else = "allow"
 cloned_ref_to_slice_refs = "allow"
+
+[patch.crates-io]
+virtio-vsock = { git = "https://github.com/luigix25/vm-virtio.git", branch = "fix_vsock" }
+virtio-queue = { git = "https://github.com/luigix25/vm-virtio.git", branch = "fix_vsock" }
+vhost = { git = "https://github.com/XanClic/vhost.git", branch = "vm-memory-0.18" }
+vhost-user-backend = { git = "https://github.com/XanClic/vhost.git", branch = "vm-memory-0.18" }

staging/Cargo.toml

@@ -10,5 +10,9 @@ vhost = { version = "0.15", features = ["vhost-user-backend"] }
 vhost-user-backend = "0.21"
 virtio-bindings = "0.2.5"
 virtio-queue = "0.17"
-vm-memory = "0.17.1"
+vm-memory = "0.18"
 vmm-sys-util = "0.15"
+[patch.crates-io]
+virtio-queue = { git = "https://github.com/luigix25/vm-virtio.git", branch = "fix_vsock" }
+vhost = { git = "https://github.com/XanClic/vhost.git", branch = "vm-memory-0.18" }
+vhost-user-backend = { git = "https://github.com/XanClic/vhost.git", branch = "vm-memory-0.18" }

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

@@ -13,7 +13,7 @@ use log::{debug, warn};
 use vhost_user_backend::{VringEpollHandler, VringRwLock, VringT};
 use virtio_queue::{desc::split::Descriptor as SplitDescriptor, QueueOwnedT};
 use vm_memory::{
-    ByteValued, Bytes, GuestAddress, GuestAddressSpace, GuestMemory, GuestMemoryAtomic,
+    ByteValued, Bytes, GuestAddress, GuestAddressSpace, GuestMemoryAtomic, GuestMemoryBackend,
     GuestMemoryMmap,
 };
 use vmm_sys_util::epoll::EventSet;

vhost-device-gpu/src/backend/gfxstream.rs

@@ -25,7 +25,7 @@ use vhost::vhost_user::{
     GpuBackend,
 };
 use vhost_user_backend::{VringRwLock, VringT};
-use vm_memory::{GuestAddress, GuestMemory, GuestMemoryMmap, VolatileSlice};
+use vm_memory::{GuestAddress, GuestMemoryBackend, GuestMemoryMmap, VolatileSlice};
 use vmm_sys_util::eventfd::EventFd;
 
 use crate::{

vhost-device-gpu/src/backend/virgl.rs

@@ -28,7 +28,7 @@ use virglrenderer::{
     FenceHandler, Iovec, VirglRenderer, VirglRendererFlags, VirglResource,
     VIRGL_HANDLE_TYPE_MEM_DMABUF,
 };
-use vm_memory::{GuestAddress, GuestMemory, GuestMemoryMmap, VolatileSlice};
+use vm_memory::{GuestAddress, GuestMemoryBackend, GuestMemoryMmap, VolatileSlice};
 use vmm_sys_util::eventfd::EventFd;
 
 use crate::{

vhost-device-gpu/src/testutils.rs

@@ -21,7 +21,7 @@ use virtio_queue::{
     Queue, QueueT,
 };
 use vm_memory::{
-    Bytes, GuestAddress, GuestAddressSpace, GuestMemory, GuestMemoryAtomic, GuestMemoryMmap,
+    Bytes, GuestAddress, GuestAddressSpace, GuestMemoryAtomic, GuestMemoryBackend, GuestMemoryMmap,
 };
 use vmm_sys_util::eventfd::EventFd;
 

vhost-device-vsock/Cargo.toml

@@ -25,7 +25,7 @@ vhost = { workspace = true }
 vhost-user-backend = { workspace = true }
 virtio-bindings = { workspace = true }
 virtio-queue = { workspace = true }
-virtio-vsock = "0.11"
+virtio-vsock = "0.12"
 vm-memory = { workspace = true }
 vmm-sys-util = { workspace = true }
 figment = { version = "0.10.19", features = ["yaml"] }

vhost-device-vsock/src/main.rs

@@ -45,6 +45,9 @@ mod vhu_vsock;
 mod vhu_vsock_thread;
 mod vsock_conn;
 
+#[cfg(test)]
+mod test_utils;
+
 use std::{
     any::Any,
     collections::HashMap,