External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-04 04:25:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

vhost_user_backend: Remove useless started field

Browse Source 
The Queue structure already contains a field "ready" that can be used to
track the status of the vrings.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2019-09-17 07:35:03 -07:00
parent 5f076923d3
commit d80ac43ef1
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vhost_user_backend/src/lib.rs
View File

@ -210,7 +210,6 @@ struct Vring {
kick: Option<EventFd>, kick: Option<EventFd>,
call: Option<EventFd>, call: Option<EventFd>,
err: Option<EventFd>, err: Option<EventFd>,
started: bool,
enabled: bool, enabled: bool,
} }
@ -221,7 +220,6 @@ impl Vring {
kick: None, kick: None,
call: None, call: None,
err: None, err: None,
started: false,
enabled: false, enabled: false,
} }
} }
@ -711,12 +709,12 @@ impl<S: VhostUserBackend> VhostUserSlaveReqHandler for VhostUserHandler<S> {
if index as usize >= self.num_queues { if index as usize >= self.num_queues {
return Err(VhostUserError::InvalidParam); return Err(VhostUserError::InvalidParam);
} }
// Quotation from vhost-user spec: // Quote from vhost-user specification:
// Client must start ring upon receiving a kick (that is, detecting // Client must start ring upon receiving a kick (that is, detecting
// that file descriptor is readable) on the descriptor specified by // that file descriptor is readable) on the descriptor specified by
// VHOST_USER_SET_VRING_KICK, and stop ring upon receiving // VHOST_USER_SET_VRING_KICK, and stop ring upon receiving
// VHOST_USER_GET_VRING_BASE. // VHOST_USER_GET_VRING_BASE.
self.vrings[index as usize].write().unwrap().started = false; self.vrings[index as usize].write().unwrap().queue.ready = false;
self.vring_handler self.vring_handler
.read() .read()
.unwrap() .unwrap()
@ -747,14 +745,12 @@ impl<S: VhostUserBackend> VhostUserSlaveReqHandler for VhostUserHandler<S> {
self.vrings[index as usize].write().unwrap().kick = self.vrings[index as usize].write().unwrap().kick =
fd.map(|x| unsafe { EventFd::from_raw_fd(x) }); fd.map(|x| unsafe { EventFd::from_raw_fd(x) });
// Quotation from vhost-user spec: // Quote from vhost-user specification:
// Client must start ring upon receiving a kick (that is, detecting // Client must start ring upon receiving a kick (that is, detecting
// that file descriptor is readable) on the descriptor specified by // that file descriptor is readable) on the descriptor specified by
// VHOST_USER_SET_VRING_KICK, and stop ring upon receiving // VHOST_USER_SET_VRING_KICK, and stop ring upon receiving
// VHOST_USER_GET_VRING_BASE. // VHOST_USER_GET_VRING_BASE.
// self.vrings[index as usize].write().unwrap().queue.ready = true;
// So we should add fd to event monitor(select, poll, epoll) here.
self.vrings[index as usize].write().unwrap().started = true;
self.vring_handler self.vring_handler
.read() .read()
.unwrap() .unwrap()