From 078c0408b33ad84dcb0bc92c85330e63fa1706db Mon Sep 17 00:00:00 2001
From: Bo Chen <chen.bo@intel.com>
Date: Wed, 26 Oct 2022 11:08:15 -0700
Subject: [PATCH] virtio-devices: console: Remove obsoleted 'INPUT_EVENT'

Since the processing of the console inputs was moved from the VMM thread
to the virtio-console thread (#3061), we have been using the 'FILE_EVENT'
to handle input from stdin/pty/file, which made 'INPUT_EVENT' obsoleted.

Signed-off-by: Bo Chen <chen.bo@intel.com>
---
 virtio-devices/src/console.rs | 33 +++------------------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/virtio-devices/src/console.rs b/virtio-devices/src/console.rs
index 8f60a4dd0..024cb3c02 100644
--- a/virtio-devices/src/console.rs
+++ b/virtio-devices/src/console.rs
@@ -41,14 +41,12 @@ const QUEUE_SIZES: &[u16] = &[QUEUE_SIZE; NUM_QUEUES];
 // New descriptors are pending on the virtio queue.
 const INPUT_QUEUE_EVENT: u16 = EPOLL_HELPER_EVENT_LAST + 1;
 const OUTPUT_QUEUE_EVENT: u16 = EPOLL_HELPER_EVENT_LAST + 2;
-// Some input from the VMM is ready to be injected into the VM.
-const INPUT_EVENT: u16 = EPOLL_HELPER_EVENT_LAST + 3;
 // Console configuration change event is triggered.
-const CONFIG_EVENT: u16 = EPOLL_HELPER_EVENT_LAST + 4;
+const CONFIG_EVENT: u16 = EPOLL_HELPER_EVENT_LAST + 3;
 // File written to (input ready)
-const FILE_EVENT: u16 = EPOLL_HELPER_EVENT_LAST + 5;
+const FILE_EVENT: u16 = EPOLL_HELPER_EVENT_LAST + 4;
 // Console resized
-const RESIZE_EVENT: u16 = EPOLL_HELPER_EVENT_LAST + 6;
+const RESIZE_EVENT: u16 = EPOLL_HELPER_EVENT_LAST + 5;
 
 //Console size feature bit
 const VIRTIO_CONSOLE_F_SIZE: u64 = 0;
@@ -100,7 +98,6 @@ struct ConsoleEpollHandler {
     endpoint: Endpoint,
     input_queue_evt: EventFd,
     output_queue_evt: EventFd,
-    input_evt: EventFd,
     config_evt: EventFd,
     resize_pipe: Option<File>,
     kill_evt: EventFd,
@@ -169,7 +166,6 @@ impl ConsoleEpollHandler {
         endpoint: Endpoint,
         input_queue_evt: EventFd,
         output_queue_evt: EventFd,
-        input_evt: EventFd,
         config_evt: EventFd,
         resize_pipe: Option<File>,
         kill_evt: EventFd,
@@ -201,7 +197,6 @@ impl ConsoleEpollHandler {
             endpoint,
             input_queue_evt,
             output_queue_evt,
-            input_evt,
             config_evt,
             resize_pipe,
             kill_evt,
@@ -306,7 +301,6 @@ impl ConsoleEpollHandler {
         let mut helper = EpollHelper::new(&self.kill_evt, &self.pause_evt)?;
         helper.add_event(self.input_queue_evt.as_raw_fd(), INPUT_QUEUE_EVENT)?;
         helper.add_event(self.output_queue_evt.as_raw_fd(), OUTPUT_QUEUE_EVENT)?;
-        helper.add_event(self.input_evt.as_raw_fd(), INPUT_EVENT)?;
         helper.add_event(self.config_evt.as_raw_fd(), CONFIG_EVENT)?;
         if let Some(resize_pipe) = self.resize_pipe.as_ref() {
             helper.add_event(resize_pipe.as_raw_fd(), RESIZE_EVENT)?;
@@ -420,25 +414,6 @@ impl EpollHelperHandler for ConsoleEpollHandler {
                     })?;
                 }
             }
-            INPUT_EVENT => {
-                self.input_evt.read().map_err(|e| {
-                    EpollHelperError::HandleEvent(anyhow!("Failed to get input event: {:?}", e))
-                })?;
-                let needs_notification = self.process_input_queue().map_err(|e| {
-                    EpollHelperError::HandleEvent(anyhow!(
-                        "Failed to process input queue : {:?}",
-                        e
-                    ))
-                })?;
-                if needs_notification {
-                    self.signal_used_queue(0).map_err(|e| {
-                        EpollHelperError::HandleEvent(anyhow!(
-                            "Failed to signal used queue: {:?}",
-                            e
-                        ))
-                    })?;
-                }
-            }
             CONFIG_EVENT => {
                 self.config_evt.read().map_err(|e| {
                     EpollHelperError::HandleEvent(anyhow!("Failed to get config event: {:?}", e))
@@ -767,7 +742,6 @@ impl VirtioDevice for Console {
         }
 
         let (kill_evt, pause_evt) = self.common.dup_eventfds();
-        let input_evt = EventFd::new(EFD_NONBLOCK).unwrap();
 
         let (_, input_queue, input_queue_evt) = queues.remove(0);
         let (_, output_queue, output_queue_evt) = queues.remove(0);
@@ -782,7 +756,6 @@ impl VirtioDevice for Console {
             self.endpoint.clone(),
             input_queue_evt,
             output_queue_evt,
-            input_evt,
             self.resizer.config_evt.try_clone().unwrap(),
             self.resize_pipe.as_ref().map(|p| p.try_clone().unwrap()),
             kill_evt,