External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-22 11:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: net: Remove unnecessary Option<> around tap

Browse Source 
This doesn't serve any benefit and just makes the code more complex.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2021-04-28 15:34:44 +01:00 committed by Sebastien Boeuf
parent fbc7011346
commit 9ef1a68539
1 changed files with 161 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,7 +285,7 @@ impl EpollHelperHandler for NetEpollHandler {
pub struct Net {
common: VirtioCommon,
id: String,
taps: Option<Vec<Tap>>,
taps: Vec<Tap>,
config: VirtioNetConfig,
ctrl_queue_epoll_thread: Option<thread::JoinHandle<()>>,
counters: NetCounters,
@ -351,7 +351,7 @@ impl Net {
..Default::default()
},
id,
taps: Some(taps),
taps,
config,
ctrl_queue_epoll_thread: None,
counters: NetCounters::default(),
@ -479,7 +479,6 @@ impl VirtioDevice for Net {
mut queues: Vec<Queue>,
mut queue_evts: Vec<EventFd>,
) -> ActivateResult {
if let Some(mut taps) = self.taps.clone() {
self.common.activate(&queues, &queue_evts, &interrupt_cb)?;
let queue_num = queues.len();
@ -519,7 +518,7 @@ impl VirtioDevice for Net {
// Let's update the barrier as we need 1 for each RX/TX pair +
// 1 for the control queue + 1 for the main thread signalling
// the pause.
self.common.paused_sync = Some(Arc::new(Barrier::new(taps.len() + 2)));
self.common.paused_sync = Some(Arc::new(Barrier::new(self.taps.len() + 2)));
let paused_sync = self.common.paused_sync.clone();
// Retrieve seccomp filter for virtio_net_ctl thread
@ -545,6 +544,7 @@ impl VirtioDevice for Net {
let event_idx = self.common.feature_acked(VIRTIO_RING_F_EVENT_IDX.into());
let mut epoll_threads = Vec::new();
let mut taps = self.taps.clone();
for i in 0..taps.len() {
let rx = RxVirtio::new();
let tx = TxVirtio::new();
@ -643,9 +643,7 @@ impl VirtioDevice for Net {
self.common.epoll_threads = Some(epoll_threads);
event!("virtio-device", "activated", "id", &self.id);
return Ok(());
}
Err(ActivateError::BadActivate)
Ok(())
}
fn reset(&mut self) -> Option<Arc<dyn VirtioInterrupt>> {