Skip to content

build: Bump rust-vmm crates #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

build: Bump rust-vmm crates #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
792678e
build: Incorporate rust-vmm crates in dev-dependencies
RuoqingHe Sep 24, 2025
e9c3095
build: Bump rust-vmm crates
RuoqingHe Sep 24, 2025
0b9e9ef
build: Remove virtio-bindings
RuoqingHe Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@ members = [

[workspace.dependencies]
# rust-vmm crates
vhost = "0.11.0"
virtio-bindings = "=0.2.4"
virtio-queue = "0.12.0"
vm-memory = "0.14.1"
vmm-sys-util = "0.12.1"
vhost = "0.14.0"
virtio-queue = "0.16.0"
vm-memory = "0.16.1"
vmm-sys-util = "0.14.0"

[dependencies]
arc-swap = "1.5"
Expand All @@ -46,7 +45,6 @@ tokio = { version = "1", optional = true }
tokio-uring = { version = "0.4.0", optional = true }
vmm-sys-util = { workspace = true, optional = true }
vm-memory = { workspace = true, features = ["backend-mmap"] }
virtio-bindings = { workspace = true, optional = true }
virtio-queue = { workspace = true, optional = true }
vhost = { workspace = true, features = ["vhost-user","vhost-user-backend"], optional = true }
versionize_derive = { version = "0.1.6", optional = true }
Expand All @@ -61,11 +59,11 @@ tokio-uring = { version = "0.4.0", optional = true }

[dev-dependencies]
tokio-test = "0.4.2"
vmm-sys-util = "0.12.1"
vm-memory = { version = "0.14.1", features = ["backend-mmap", "backend-bitmap"] }
vmm-sys-util = { workspace = true }
vm-memory = { workspace = true, features = ["backend-mmap", "backend-bitmap"] }

[features]
default = ["fusedev"]
default = ["vhost-user-fs"]
async-io = [
"async-trait",
"tokio-uring",
Expand Down
50 changes: 0 additions & 50 deletions src/transport/fs_cache_req_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,7 @@ mod virtiofs {
use std::io;
use std::os::unix::io::RawFd;

#[cfg(feature = "vhost-user-fs")]
use vhost::vhost_user::message::{
VhostUserFSBackendMsg, VhostUserFSBackendMsgFlags, VHOST_USER_FS_BACKEND_ENTRIES,
};
#[cfg(feature = "vhost-user-fs")]
use vhost::vhost_user::{Backend, VhostUserFrontendReqHandler};

use crate::abi::virtio_fs::RemovemappingOne;
#[cfg(feature = "vhost-user-fs")]
use crate::abi::virtio_fs::SetupmappingFlags;

/// Trait to support virtio-fs DAX Window operations.
///
Expand Down Expand Up @@ -52,45 +43,4 @@ mod virtiofs {
/// Remove those mappings that provide the access to file data.
fn unmap(&mut self, requests: Vec<RemovemappingOne>) -> io::Result<()>;
}

#[cfg(feature = "vhost-user-fs")]
impl FsCacheReqHandler for Backend {
fn map(
&mut self,
foffset: u64,
moffset: u64,
len: u64,
flags: u64,
fd: RawFd,
) -> io::Result<()> {
let mut msg: VhostUserFSBackendMsg = Default::default();
msg.fd_offset[0] = foffset;
msg.cache_offset[0] = moffset;
msg.len[0] = len;
msg.flags[0] = if (flags & SetupmappingFlags::WRITE.bits()) != 0 {
VhostUserFSBackendMsgFlags::MAP_W | VhostUserFSBackendMsgFlags::MAP_R
} else {
VhostUserFSBackendMsgFlags::MAP_R
};

self.fs_backend_map(&msg, &fd)?;

Ok(())
}

fn unmap(&mut self, requests: Vec<RemovemappingOne>) -> io::Result<()> {
for chunk in requests.chunks(VHOST_USER_FS_BACKEND_ENTRIES) {
let mut msg: VhostUserFSBackendMsg = Default::default();

for (ind, req) in chunk.iter().enumerate() {
msg.len[ind] = req.len;
msg.cache_offset[ind] = req.moffset;
}

self.fs_backend_unmap(&msg)?;
}

Ok(())
}
}
}
Loading