diff options
Diffstat (limited to 'src/linux.rs')
-rw-r--r-- | src/linux.rs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/linux.rs b/src/linux.rs index 7ce7c82..58e0971 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -10,6 +10,7 @@ use std::ffi::CStr; use std::fmt::{self, Display}; use std::fs::{File, OpenOptions}; use std::io::{self, stdin, Read}; +use std::mem; use std::net::Ipv4Addr; #[cfg(feature = "gpu")] use std::num::NonZeroU8; @@ -1517,7 +1518,8 @@ fn run_control( let vcpu_thread_barrier = Arc::new(Barrier::new(linux.vcpus.len() + 1)); let run_mode_arc = Arc::new(VcpuRunMode::default()); setup_vcpu_signal_handler()?; - for (cpu_id, vcpu) in linux.vcpus.into_iter().enumerate() { + let vcpus = linux.vcpus.split_off(0); + for (cpu_id, vcpu) in vcpus.into_iter().enumerate() { let handle = run_vcpu( vcpu, cpu_id as u32, @@ -1804,6 +1806,10 @@ fn run_control( } } + // Explicitly drop the VM structure here to allow the devices to clean up before the + // control sockets are closed when this function exits. + mem::drop(linux); + stdin_lock .set_canon_mode() .expect("failed to restore canonical mode for terminal"); |