pxcloud/vhost-device
5
0
Fork 0
mirror of https://github.com/rust-vmm/vhost-device.git synced 2026-01-04 16:38:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vsock: Minor cleanups

Browse Source 
Minor cleanups.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
This commit is contained in:
Viresh Kumar 2022-10-13 13:05:26 +05:30
parent 5e83d0c93f
commit 5005c96c3a
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/vsock/src/main.rs
View File

@ -28,7 +28,7 @@ struct VsockArgs {
#[clap(long, default_value_t = 3)]
guest_cid: u64,
/// Unix socket to which a hypervisor conencts to and sets up the control path with the device.
/// Unix socket to which a hypervisor connects to and sets up the control path with the device.
#[clap(long)]
socket: String,

19
crates/vsock/src/vhu_vsock.rs
View File

@ -1,6 +1,10 @@
// SPDX-License-Identifier: Apache-2.0 or BSD-3-Clause
use std::{io, result, sync::Mutex, u16, u32, u64, u8};
use std::{
io::{self, Result as IoResult},
sync::Mutex,
u16, u32, u64, u8,
};
use thiserror::Error as ThisError;
use vhost::vhost_user::message::{VhostUserProtocolFeatures, VhostUserVirtioFeatures};
@ -40,7 +44,7 @@ pub(crate) const VSOCK_HOST_CID: u64 = 2;
/// Connection oriented packet
pub(crate) const VSOCK_TYPE_STREAM: u16 = 1;
// Vsock packet operation ID
/// Vsock packet operation ID
/// Connection request
pub(crate) const VSOCK_OP_REQUEST: u16 = 1;
@ -57,7 +61,7 @@ pub(crate) const VSOCK_OP_CREDIT_UPDATE: u16 = 6;
/// Flow control credit request
pub(crate) const VSOCK_OP_CREDIT_REQUEST: u16 = 7;
// Vsock packet flags
/// Vsock packet flags
/// VSOCK_OP_SHUTDOWN: Packet sender will receive no more data
pub(crate) const VSOCK_FLAGS_SHUTDOWN_RCV: u32 = 1;
@ -69,7 +73,7 @@ const QUEUE_MASK: u64 = 0b11;
pub(crate) type Result<T> = std::result::Result<T, Error>;
/// Below enum defines custom error types.
/// Custom error types
#[derive(Debug, ThisError)]
pub(crate) enum Error {
#[error("Failed to handle event other than EPOLLIN event")]
@ -246,10 +250,7 @@ impl VhostUserBackendMut<VringRwLock, ()> for VhostUserVsockBackend {
}
}
fn update_memory(
&mut self,
atomic_mem: GuestMemoryAtomic<GuestMemoryMmap>,
) -> result::Result<(), io::Error> {
fn update_memory(&mut self, atomic_mem: GuestMemoryAtomic<GuestMemoryMmap>) -> IoResult<()> {
for thread in self.threads.iter() {
thread.lock().unwrap().mem = Some(atomic_mem.clone());
}
@ -262,7 +263,7 @@ impl VhostUserBackendMut<VringRwLock, ()> for VhostUserVsockBackend {
evset: EventSet,
vrings: &[VringRwLock],
thread_id: usize,
) -> result::Result<bool, io::Error> {
) -> IoResult<bool> {
let vring_rx = &vrings[0];
let vring_tx = &vrings[1];