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

vm-virtio: Rename epoll_thread to epoll_threads

Browse Source 
Now that we unified epoll_thread to potentially be a vector of threads,
it makes sense to make it a plural field.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz
2020-01-27 14:14:56 +01:00
committed by Sebastien Boeuf
parent f648f2856d
commit c06a827cbb
11 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vm-virtio/src/vhost_user/blk.rs
View File

@@ -47,7 +47,7 @@ pub struct Blk {
queue_sizes: Vec<u16>,
queue_evts: Option<Vec<EventFd>>,
interrupt_cb: Option<Arc<dyn VirtioInterrupt>>,
epoll_thread: Option<Vec<thread::JoinHandle<result::Result<(), DeviceError>>>>,
epoll_threads: Option<Vec<thread::JoinHandle<result::Result<(), DeviceError>>>>,
paused: Arc<AtomicBool>,
}
@@ -130,7 +130,7 @@ impl Blk {
queue_sizes: vec![vu_cfg.queue_size; vu_cfg.num_queues],
queue_evts: None,
interrupt_cb: None,
epoll_thread: None,
epoll_threads: None,
paused: Arc::new(AtomicBool::new(false)),
})
}
@@ -284,7 +284,7 @@ impl VirtioDevice for Blk {
ActivateError::BadActivate
})?;
self.epoll_thread = Some(epoll_threads);
self.epoll_threads = Some(epoll_threads);
Ok(())
}

6
vm-virtio/src/vhost_user/fs.rs
View File

@@ -162,7 +162,7 @@ pub struct Fs {
slave_req_support: bool,
queue_evts: Option<Vec<EventFd>>,
interrupt_cb: Option<Arc<dyn VirtioInterrupt>>,
epoll_thread: Option<Vec<thread::JoinHandle<result::Result<(), DeviceError>>>>,
epoll_threads: Option<Vec<thread::JoinHandle<result::Result<(), DeviceError>>>>,
paused: Arc<AtomicBool>,
}
@@ -248,7 +248,7 @@ impl Fs {
slave_req_support,
queue_evts: None,
interrupt_cb: None,
epoll_thread: None,
epoll_threads: None,
paused: Arc::new(AtomicBool::new(false)),
})
}
@@ -430,7 +430,7 @@ impl VirtioDevice for Fs {
ActivateError::BadActivate
})?;
self.epoll_thread = Some(epoll_threads);
self.epoll_threads = Some(epoll_threads);
Ok(())
}

10
vm-virtio/src/vhost_user/net.rs
View File

@@ -45,7 +45,7 @@ pub struct Net {
queue_sizes: Vec<u16>,
queue_evts: Option<Vec<EventFd>>,
interrupt_cb: Option<Arc<dyn VirtioInterrupt>>,
epoll_thread: Option<Vec<thread::JoinHandle<result::Result<(), DeviceError>>>>,
epoll_threads: Option<Vec<thread::JoinHandle<result::Result<(), DeviceError>>>>,
ctrl_queue_epoll_thread: Option<thread::JoinHandle<result::Result<(), CtrlError>>>,
paused: Arc<AtomicBool>,
}
@@ -143,7 +143,7 @@ impl Net {
queue_sizes: vec![vu_cfg.queue_size; queue_num],
queue_evts: None,
interrupt_cb: None,
epoll_thread: None,
epoll_threads: None,
ctrl_queue_epoll_thread: None,
paused: Arc::new(AtomicBool::new(false)),
})
@@ -307,7 +307,7 @@ impl VirtioDevice for Net {
)
.map_err(ActivateError::VhostUserNetSetup)?;
let mut epoll_thread = Vec::new();
let mut epoll_threads = Vec::new();
for _ in 0..vu_interrupt_list.len() / 2 {
let mut interrupt_list_sub: Vec<(Option<EventFd>, Queue)> = Vec::with_capacity(2);
interrupt_list_sub.push(vu_interrupt_list.remove(0));
@@ -325,14 +325,14 @@ impl VirtioDevice for Net {
thread::Builder::new()
.name("vhost_user_net".to_string())
.spawn(move || handler.run(paused))
.map(|thread| epoll_thread.push(thread))
.map(|thread| epoll_threads.push(thread))
.map_err(|e| {
error!("failed to clone queue EventFd: {}", e);
ActivateError::BadActivate
})?;
}
self.epoll_thread = Some(epoll_thread);
self.epoll_threads = Some(epoll_threads);
Ok(())
}