kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Restore tty to canonical mode when SIGTERM or SIGINT received

Browse Source 
The tty mode remains raw mode when cloud-hypervisor is terminted by
SIGTERM or SIGINT. The terminal is unusable due to echoing is
disabled which is really annoying.

Signed-off-by: Qiu Wenbo <qiuwenbo@phytium.com.cn>
This commit is contained in:
Qiu Wenbo
2019-12-05 11:27:40 +08:00
committed by Sebastien Boeuf
parent 44d026bfb1
commit e1af17d93a
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
vmm/src/vm.rs
View File

@@ -36,7 +36,7 @@ use kvm_ioctls::*;
use linux_loader::cmdline::Cmdline; use linux_loader::cmdline::Cmdline;
use linux_loader::loader::KernelLoader; use linux_loader::loader::KernelLoader;
use signal_hook::{iterator::Signals, SIGWINCH}; use signal_hook::{iterator::Signals, SIGINT, SIGTERM, SIGWINCH};
use std::ffi::CString; use std::ffi::CString;
use std::fs::{File, OpenOptions}; use std::fs::{File, OpenOptions};
use std::io; use std::io;
@@ -675,11 +675,23 @@ impl Vm {
Ok(()) Ok(())
} }
fn os_signal_handler(signals: Signals, console_input_clone: Arc<Console>) { fn os_signal_handler(signals: Signals, console_input_clone: Arc<Console>, on_tty: bool) {
for signal in signals.forever() { for signal in signals.forever() {
if signal == SIGWINCH { match signal {
let (col, row) = get_win_size(); SIGWINCH => {
console_input_clone.update_console_size(col, row); let (col, row) = get_win_size();
console_input_clone.update_console_size(col, row);
}
SIGTERM | SIGINT => {
if on_tty {
io::stdin()
.lock()
.set_canon_mode()
.expect("failed to restore terminal mode");
}
std::process::exit((signal != SIGTERM) as i32);
}
_ => (),
} }
} }
} }
@@ -703,15 +715,16 @@ impl Vm {
if self.devices.console().input_enabled() { if self.devices.console().input_enabled() {
let console = self.devices.console().clone(); let console = self.devices.console().clone();
let signals = Signals::new(&[SIGWINCH]); let signals = Signals::new(&[SIGWINCH, SIGINT, SIGTERM]);
match signals { match signals {
Ok(signals) => { Ok(signals) => {
self.signals = Some(signals.clone()); self.signals = Some(signals.clone());
let on_tty = self.on_tty;
self.threads.push( self.threads.push(
thread::Builder::new() thread::Builder::new()
.name("signal_handler".to_string()) .name("signal_handler".to_string())
.spawn(move || Vm::os_signal_handler(signals, console)) .spawn(move || Vm::os_signal_handler(signals, console, on_tty))
.map_err(Error::SignalHandlerSpawn)?, .map_err(Error::SignalHandlerSpawn)?,
); );
} }