From 3d6d9ca4ded19650e0de8ac01677ba353a05c564 Mon Sep 17 00:00:00 2001
From: Bo Chen <chen.bo@intel.com>
Date: Fri, 14 Aug 2020 14:53:16 -0700
Subject: [PATCH] virtio-devices: Print out error message from the net worker
 thread

Partially fixes: #1551

Signed-off-by: Bo Chen <chen.bo@intel.com>
---
 virtio-devices/src/net.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/virtio-devices/src/net.rs b/virtio-devices/src/net.rs
index edf3d721f..710fc5de5 100644
--- a/virtio-devices/src/net.rs
+++ b/virtio-devices/src/net.rs
@@ -206,7 +206,7 @@ pub struct Net {
     config: VirtioNetConfig,
     queue_evts: Option<Vec<EventFd>>,
     interrupt_cb: Option<Arc<dyn VirtioInterrupt>>,
-    epoll_threads: Option<Vec<thread::JoinHandle<result::Result<(), EpollHelperError>>>>,
+    epoll_threads: Option<Vec<thread::JoinHandle<()>>>,
     ctrl_queue_epoll_thread: Option<thread::JoinHandle<()>>,
     paused: Arc<AtomicBool>,
     paused_sync: Arc<Barrier>,
@@ -492,7 +492,11 @@ impl VirtioDevice for Net {
                 let paused_sync = self.paused_sync.clone();
                 thread::Builder::new()
                     .name("virtio_net".to_string())
-                    .spawn(move || handler.run(paused, paused_sync))
+                    .spawn(move || {
+                        if let Err(e) = handler.run(paused, paused_sync) {
+                            error!("Error running worker: {:?}", e);
+                        }
+                    })
                     .map(|thread| epoll_threads.push(thread))
                     .map_err(|e| {
                         error!("failed to clone queue EventFd: {}", e);