kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Bump vm-memory and its consumers

Browse Source 
Update to the latest vm-memory and all the crates that also depend upon
it.

Fix some deprecation warnings.

Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
This commit is contained in:
Rob Bradford
2023-09-07 13:21:02 +01:00
committed by Bo Chen
parent 4548de194d
commit 07d1208dd5
20 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net_util/Cargo.toml
View File

@@ -16,8 +16,8 @@ thiserror = "1.0.40"
versionize = "0.1.10"
versionize_derive = "0.1.4"
virtio-bindings = "0.2.0"
virtio-queue = "0.8.0"
vm-memory = { version = "0.11.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
virtio-queue = "0.9.0"
vm-memory = { version = "0.12.2", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = "0.11.0"

8
net_util/src/queue_pair.rs
View File

@@ -64,9 +64,9 @@ impl TxVirtio {
.memory()
.get_slice(desc_addr, desc.len() as usize)
.map_err(NetQueuePairError::GuestMemory)?
.as_ptr();
.ptr_guard_mut();
let iovec = libc::iovec {
iov_base: buf as *mut libc::c_void,
iov_base: buf.as_ptr() as *mut libc::c_void,
iov_len: desc.len() as libc::size_t,
};
iovecs.push(iovec);
@@ -203,9 +203,9 @@ impl RxVirtio {
.memory()
.get_slice(desc_addr, desc.len() as usize)
.map_err(NetQueuePairError::GuestMemory)?
.as_ptr();
.ptr_guard_mut();
let iovec = libc::iovec {
iov_base: buf as *mut libc::c_void,
iov_base: buf.as_ptr() as *mut libc::c_void,
iov_len: desc.len() as libc::size_t,
};
iovecs.push(iovec);