External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-01-22 20:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: vm: Unpark the threads before shutdown when the current state is paused

Browse Source 
If the current state is paused that means most of the handles got killed by pthread_kill
We need to unpark those threads to make the shutdown worked. Otherwise
The shutdown API hangs and the API is not responding afterwards. So
before the shutdown call we need to resume the VM make it succeed.

Fixes: #817

Signed-off-by: Muminul Islam <muislam@microsoft.com>
This commit is contained in:
Muminul Islam 2020-04-23 10:57:30 -07:00 committed by Samuel Ortiz
parent 1df38daf74
commit e1a07ce3c4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vmm/src/vm.rs
View File

@ -576,10 +576,15 @@ impl Vm {
}
pub fn shutdown(&mut self) -> Result<()> {
let mut state = self.state.try_write().map_err(|_| Error::PoisonedState)?;
let current_state = self.get_state()?;
let new_state = VmState::Shutdown;
state.valid_transition(new_state)?;
current_state.valid_transition(new_state)?;
// If the current state is paused that means most of the handles got killed by pthread_kill
// We need to unpark those threads by calling resume
if current_state == VmState::Paused {
self.resume().map_err(Error::Resume)?;
}
if self.on_tty {
// Don't forget to set the terminal in canonical mode
@ -605,6 +610,8 @@ impl Vm {
for thread in self.threads.drain(..) {
thread.join().map_err(Error::ThreadCleanup)?
}
let mut state = self.state.try_write().map_err(|_| Error::PoisonedState)?;
*state = new_state;
Ok(())