From 520aff2efcd860d828789a9a751b9ede6333332a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 22 Mar 2023 22:17:15 +0000 Subject: [PATCH] vmm: don't redundantly set the TTY to canon mode If the VM is shut down, either it's going to be started again, in which case we still want to be in raw mode, or the process is about to exit, in which case canon mode will be set at the end of main. Signed-off-by: Alyssa Ross --- vmm/src/vm.rs | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs index 0633c317d..a61baaee6 100644 --- a/vmm/src/vm.rs +++ b/vmm/src/vm.rs @@ -141,9 +141,6 @@ pub enum Error { #[error("Cannot setup terminal in raw mode: {0}")] SetTerminalRaw(#[source] vmm_sys_util::errno::Error), - #[error("Cannot setup terminal in canonical mode.: {0}")] - SetTerminalCanon(#[source] vmm_sys_util::errno::Error), - #[error("Cannot spawn a signal handler thread: {0}")] SignalHandlerSpawn(#[source] io::Error), @@ -1205,15 +1202,6 @@ impl Vm { state.valid_transition(new_state)?; - if self.on_tty { - // Don't forget to set the terminal in canonical mode - // before to exit. - io::stdin() - .lock() - .set_canon_mode() - .map_err(Error::SetTerminalCanon)?; - } - // Wake up the DeviceManager threads so they will get terminated cleanly self.device_manager .lock()