External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-01 02:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Split up functions for creating signal handler and tty setup

Browse Source 
These are quite separate and should be in their own functions.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2021-09-08 15:17:17 +01:00 committed by Bo Chen
parent 387753ae1d
commit e0d05683ab
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vmm/src/vm.rs
View File

@ -1800,7 +1800,7 @@ impl Vm {
Ok(())
}
fn setup_interactive(&mut self) -> Result<()> {
fn setup_signal_handler(&mut self) -> Result<()> {
let console = self.device_manager.lock().unwrap().console().clone();
let signals = Signals::new(&HANDLED_SIGNALS);
match signals {
@ -1831,7 +1831,10 @@ impl Vm {
}
Err(e) => error!("Signal not found {}", e),
}
Ok(())
}
fn setup_tty(&self) -> Result<()> {
if self.on_tty {
io::stdin()
.lock()
@ -1908,7 +1911,8 @@ impl Vm {
.start_boot_vcpus()
.map_err(Error::CpuManager)?;
self.setup_interactive()?;
self.setup_signal_handler()?;
self.setup_tty()?;
let mut state = self.state.try_write().map_err(|_| Error::PoisonedState)?;
*state = new_state;
@ -2418,9 +2422,11 @@ impl Snapshottable for Vm {
MigratableError::Restore(anyhow!("Cannot start restored vCPUs: {:#?}", e))
})?;
self.setup_interactive().map_err(|e| {
MigratableError::Restore(anyhow!("Could not setup terminal and signals: {:#?}", e))
self.setup_signal_handler().map_err(|e| {
MigratableError::Restore(anyhow!("Could not setup signal handler: {:#?}", e))
})?;
self.setup_tty()
.map_err(|e| MigratableError::Restore(anyhow!("Could not setup tty: {:#?}", e)))?;
let mut state = self
.state