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

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

Browse Source 
This reverts commit e1a07ce3c42f771364078a526db00ab2029c0e37.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-05-06 10:10:58 +01:00 committed by Sebastien Boeuf
parent 797cd13dcc
commit cd60de8f7f
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vmm/src/vm.rs
View File

@ -589,15 +589,10 @@ impl Vm {
}
pub fn shutdown(&mut self) -> Result<()> {
let current_state = self.get_state()?;
let mut state = self.state.try_write().map_err(|_| Error::PoisonedState)?;
let new_state = VmState::Shutdown;
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)?;
}
state.valid_transition(new_state)?;
if self.on_tty {
// Don't forget to set the terminal in canonical mode
@ -623,8 +618,6 @@ 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(())