External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 21:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: net: Simplify activate function

Browse Source 
Move the if-let for the taps later which makes the earlier activation
code identical to other devices.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-09-03 16:39:13 +01:00
parent 31d7712878
commit 56f03db69c
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
virtio-devices/src/net.rs
View File

@ -388,22 +388,21 @@ impl VirtioDevice for Net {
})?; })?;
self.pause_evt = Some(self_pause_evt); self.pause_evt = Some(self_pause_evt);
if let Some(mut taps) = self.taps.clone() { // Save the interrupt EventFD as we need to return it on reset
// Save the interrupt EventFD as we need to return it on reset // but clone it to pass into the thread.
self.interrupt_cb = Some(interrupt_cb.clone());
let mut tmp_queue_evts: Vec<EventFd> = Vec::new();
for queue_evt in queue_evts.iter() {
// Save the queue EventFD as we need to return it on reset
// but clone it to pass into the thread. // but clone it to pass into the thread.
self.interrupt_cb = Some(interrupt_cb.clone()); tmp_queue_evts.push(queue_evt.try_clone().map_err(|e| {
error!("failed to clone queue EventFd: {}", e);
let mut tmp_queue_evts: Vec<EventFd> = Vec::new(); ActivateError::BadActivate
for queue_evt in queue_evts.iter() { })?);
// Save the queue EventFD as we need to return it on reset }
// but clone it to pass into the thread. self.queue_evts = Some(tmp_queue_evts);
tmp_queue_evts.push(queue_evt.try_clone().map_err(|e| {
error!("failed to clone queue EventFd: {}", e);
ActivateError::BadActivate
})?);
}
self.queue_evts = Some(tmp_queue_evts);
if let Some(mut taps) = self.taps.clone() {
let queue_num = queues.len(); let queue_num = queues.len();
if self.common.feature_acked(VIRTIO_NET_F_CTRL_VQ.into()) && queue_num % 2 != 0 { if self.common.feature_acked(VIRTIO_NET_F_CTRL_VQ.into()) && queue_num % 2 != 0 {
let cvq_queue = queues.remove(queue_num - 1); let cvq_queue = queues.remove(queue_num - 1);