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

virtio-devices: net_ctrlq: Port to EpollHelper

Browse Source 
Migrate virtio-net and vhost-user-net control queue to EpollHelper so
as to remove code duplication.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf
2020-08-12 12:22:00 +02:00
parent 32b70e354c
commit a502cb282e
3 changed files with 43 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,7 +203,7 @@ pub struct Net {
queue_evts: Option<Vec<EventFd>>,
interrupt_cb: Option<Arc<dyn VirtioInterrupt>>,
epoll_threads: Option<Vec<thread::JoinHandle<result::Result<(), EpollHelperError>>>>,
ctrl_queue_epoll_thread: Option<thread::JoinHandle<result::Result<(), DeviceError>>>,
ctrl_queue_epoll_thread: Option<thread::JoinHandle<()>>,
paused: Arc<AtomicBool>,
queue_size: Vec<u16>,
counters: NetCounters,
@@ -426,10 +426,11 @@ impl VirtioDevice for Net {
thread::Builder::new()
.name("virtio_net".to_string())
.spawn(move || {
SeccompFilter::apply(virtio_net_seccomp_filter)
.map_err(DeviceError::ApplySeccompFilter)?;
ctrl_handler.run_ctrl(paused)
if let Err(e) = SeccompFilter::apply(virtio_net_seccomp_filter) {
error!("Error applying seccomp filter: {:?}", e);
} else if let Err(e) = ctrl_handler.run_ctrl(paused) {
error!("Error running worker: {:?}", e);
}
})
.map(|thread| self.ctrl_queue_epoll_thread = Some(thread))
.map_err(|e| {