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/vhost@vhost-user-backend-v0.18.0...vhost-user-backend-v0.19.0) Updates `virtio-queue` from 0.14.0 to 0.15.0 - [Release notes](https://github.com/rust-vmm/vm-virtio/releases) - [Commits](rust-vmm/vm-virtio@virtio-queue-v0.14.0...virtio-queue-v0.15.0) Updates `virtio-vsock` from 0.8.0 to 0.9.0 - [Release notes](https://github.com/rust-vmm/vm-virtio/releases) - [Commits](rust-vmm/vm-virtio@virtio-vsock-v0.8.0...virtio-vsock-v0.9.0) Signed-off-by: Wenyu Huang <huangwenyuu@outlook.com>
This commit is contained in:
parent
3e98e89aaa
commit
91a625603f
34 changed files with 377 additions and 238 deletions
|
|
@ -24,13 +24,13 @@ epoll = "4.3"
|
|||
log = "0.4"
|
||||
thiserror = "2.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"] }
|
||||
|
|
|
|||
|
|
@ -860,7 +860,11 @@ mod tests {
|
|||
use std::io::Cursor;
|
||||
|
||||
use virtio_bindings::virtio_ring::{VRING_DESC_F_NEXT, VRING_DESC_F_WRITE};
|
||||
use virtio_queue::{mock::MockSplitQueue, Descriptor, Queue};
|
||||
use virtio_queue::{
|
||||
desc::{split::Descriptor as SplitDescriptor, RawDescriptor},
|
||||
mock::MockSplitQueue,
|
||||
Queue,
|
||||
};
|
||||
use vm_memory::{Bytes, GuestAddress, GuestMemoryAtomic, GuestMemoryMmap};
|
||||
|
||||
use super::*;
|
||||
|
|
@ -972,7 +976,12 @@ mod tests {
|
|||
flags[i as usize] & !VRING_DESC_F_NEXT as u16
|
||||
};
|
||||
|
||||
let desc = Descriptor::new(u64::from(0x100 * (i + 1)), len, desc_flags, i + 1);
|
||||
let desc = RawDescriptor::from(SplitDescriptor::new(
|
||||
u64::from(0x100 * (i + 1)),
|
||||
len,
|
||||
desc_flags,
|
||||
i + 1,
|
||||
));
|
||||
desc_vec.push(desc);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue