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: Upgrade vm-memory crates and its consumers

Browse Source 
Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
Bo Chen
2023-11-07 11:37:23 -08:00
committed by Rob Bradford
parent d4a163dd39
commit 4d7a4c598a
25 changed files with 179 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vhost_user_net/Cargo.toml
View File

@@ -13,9 +13,9 @@ libc = "0.2.147"
log = "0.4.17"
net_util = { path = "../net_util" }
option_parser = { path = "../option_parser" }
vhost = { version = "0.8.1", features = ["vhost-user-slave"] }
vhost-user-backend = "0.10.1"
vhost = { version = "0.9.0", features = ["vhost-user-backend"] }
vhost-user-backend = "0.11.0"
virtio-bindings = "0.2.0"
vm-memory = "0.12.2"
vm-memory = "0.13.1"
vmm-sys-util = "0.11.0"

11
vhost_user_net/src/lib.rs
View File

@@ -158,9 +158,10 @@ impl VhostUserNetBackend {
}
}
impl VhostUserBackendMut<VringRwLock<GuestMemoryAtomic<GuestMemoryMmap>>, AtomicBitmap>
for VhostUserNetBackend
{
impl VhostUserBackendMut for VhostUserNetBackend {
type Bitmap = AtomicBitmap;
type Vring = VringRwLock<GuestMemoryAtomic<GuestMemoryMmap>>;
fn num_queues(&self) -> usize {
self.num_queues
}
@@ -203,7 +204,7 @@ impl VhostUserBackendMut<VringRwLock<GuestMemoryAtomic<GuestMemoryMmap>>, Atomic
_evset: EventSet,
vrings: &[VringRwLock<GuestMemoryAtomic<GuestMemoryMmap>>],
thread_id: usize,
) -> VhostUserBackendResult<bool> {
) -> VhostUserBackendResult<()> {
let mut thread = self.threads[thread_id].lock().unwrap();
match device_event {
0 => {
@@ -245,7 +246,7 @@ impl VhostUserBackendMut<VringRwLock<GuestMemoryAtomic<GuestMemoryMmap>>, Atomic
_ => return Err(Error::HandleEventUnknownEvent.into()),
}
Ok(false)
Ok(())
}
fn exit_event(&self, thread_index: usize) -> Option<EventFd> {