vm-virtio: Make all virtio devices potentially multi-threaded

Although only the block and net virtio devices can actually be multi
threaded (for now), handling them as special cases makes the code more
complex.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

vm-virtio/src/vhost_user/blk.rs

@@ -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<thread::JoinHandle<result::Result<(), DeviceError>>>,
+    epoll_thread: Option<Vec<thread::JoinHandle<result::Result<(), DeviceError>>>>,
     paused: Arc<AtomicBool>,
 }
 
@@ -274,15 +274,18 @@ impl VirtioDevice for Blk {
         });
 
         let paused = self.paused.clone();
+        let mut epoll_threads = Vec::new();
         thread::Builder::new()
             .name("vhost_user_blk".to_string())
             .spawn(move || handler.run(paused))
-            .map(|thread| self.epoll_thread = Some(thread))
+            .map(|thread| epoll_threads.push(thread))
             .map_err(|e| {
                 error!("failed to clone virtio epoll thread: {}", e);
                 ActivateError::BadActivate
             })?;
 
+        self.epoll_thread = Some(epoll_threads);
+
         Ok(())
     }
 

vm-virtio/src/vhost_user/fs.rs

@@ -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<thread::JoinHandle<result::Result<(), DeviceError>>>,
+    epoll_thread: Option<Vec<thread::JoinHandle<result::Result<(), DeviceError>>>>,
     paused: Arc<AtomicBool>,
 }
 
@@ -420,15 +420,18 @@ impl VirtioDevice for Fs {
         });
 
         let paused = self.paused.clone();
+        let mut epoll_threads = Vec::new();
         thread::Builder::new()
             .name("virtio_fs".to_string())
             .spawn(move || handler.run(paused))
-            .map(|thread| self.epoll_thread = Some(thread))
+            .map(|thread| epoll_threads.push(thread))
             .map_err(|e| {
                 error!("failed to clone queue EventFd: {}", e);
                 ActivateError::BadActivate
             })?;
 
+        self.epoll_thread = Some(epoll_threads);
+
         Ok(())
     }