External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-01 17:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: console: Remove obsoleted 'INPUT_EVENT'

Browse Source 
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>
This commit is contained in:
Bo Chen 2022-10-26 11:08:15 -07:00 committed by Sebastien Boeuf
parent b99b2bc990
commit 078c0408b3
1 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
virtio-devices/src/console.rs
View File

@ -41,14 +41,12 @@ const QUEUE_SIZES: &[u16] = &[QUEUE_SIZE; NUM_QUEUES];
// New descriptors are pending on the virtio queue. // New descriptors are pending on the virtio queue.
const INPUT_QUEUE_EVENT: u16 = EPOLL_HELPER_EVENT_LAST + 1; const INPUT_QUEUE_EVENT: u16 = EPOLL_HELPER_EVENT_LAST + 1;
const OUTPUT_QUEUE_EVENT: u16 = EPOLL_HELPER_EVENT_LAST + 2; 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. // 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) // 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 // Console resized
const RESIZE_EVENT: u16 = EPOLL_HELPER_EVENT_LAST + 6; const RESIZE_EVENT: u16 = EPOLL_HELPER_EVENT_LAST + 5;
//Console size feature bit //Console size feature bit
const VIRTIO_CONSOLE_F_SIZE: u64 = 0; const VIRTIO_CONSOLE_F_SIZE: u64 = 0;
@ -100,7 +98,6 @@ struct ConsoleEpollHandler {
endpoint: Endpoint, endpoint: Endpoint,
input_queue_evt: EventFd, input_queue_evt: EventFd,
output_queue_evt: EventFd, output_queue_evt: EventFd,
input_evt: EventFd,
config_evt: EventFd, config_evt: EventFd,
resize_pipe: Option<File>, resize_pipe: Option<File>,
kill_evt: EventFd, kill_evt: EventFd,
@ -169,7 +166,6 @@ impl ConsoleEpollHandler {
endpoint: Endpoint, endpoint: Endpoint,
input_queue_evt: EventFd, input_queue_evt: EventFd,
output_queue_evt: EventFd, output_queue_evt: EventFd,
input_evt: EventFd,
config_evt: EventFd, config_evt: EventFd,
resize_pipe: Option<File>, resize_pipe: Option<File>,
kill_evt: EventFd, kill_evt: EventFd,
@ -201,7 +197,6 @@ impl ConsoleEpollHandler {
endpoint, endpoint,
input_queue_evt, input_queue_evt,
output_queue_evt, output_queue_evt,
input_evt,
config_evt, config_evt,
resize_pipe, resize_pipe,
kill_evt, kill_evt,
@ -306,7 +301,6 @@ impl ConsoleEpollHandler {
let mut helper = EpollHelper::new(&self.kill_evt, &self.pause_evt)?; 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.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.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)?; helper.add_event(self.config_evt.as_raw_fd(), CONFIG_EVENT)?;
if let Some(resize_pipe) = self.resize_pipe.as_ref() { if let Some(resize_pipe) = self.resize_pipe.as_ref() {
helper.add_event(resize_pipe.as_raw_fd(), RESIZE_EVENT)?; 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 => { CONFIG_EVENT => {
self.config_evt.read().map_err(|e| { self.config_evt.read().map_err(|e| {
EpollHelperError::HandleEvent(anyhow!("Failed to get config event: {:?}", 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 (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 (_, input_queue, input_queue_evt) = queues.remove(0);
let (_, output_queue, output_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(), self.endpoint.clone(),
input_queue_evt, input_queue_evt,
output_queue_evt, output_queue_evt,
input_evt,
self.resizer.config_evt.try_clone().unwrap(), self.resizer.config_evt.try_clone().unwrap(),
self.resize_pipe.as_ref().map(|p| p.try_clone().unwrap()), self.resize_pipe.as_ref().map(|p| p.try_clone().unwrap()),
kill_evt, kill_evt,