github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-30 23:37:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10339 from lifupan/main_fix

Browse Source 
runtime-rs: fix the issue of using block_on
This commit is contained in:
Fupan Li 2024-09-23 09:28:40 +08:00 committed by GitHub
commit f1f5bef9ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/runtime-rs/crates/hypervisor/src/ch/inner_hypervisor.rs
View File

@ -19,7 +19,6 @@ use ch_config::ch_api::{
};
use ch_config::{guest_protection_is_tdx, NamedHypervisorConfig, VmConfig};
use core::future::poll_fn;
use futures::executor::block_on;
use futures::future::join_all;
use kata_sys_util::protection::{available_guest_protection, GuestProtection};
use kata_types::capabilities::{Capabilities, CapabilityBits};
@ -640,7 +639,7 @@ impl CloudHypervisorInner {
Ok(())
}
pub(crate) fn stop_vm(&mut self) -> Result<()> {
pub(crate) async fn stop_vm(&mut self) -> Result<()> {
// If the container workload exits, this method gets called. However,
// the container manager always makes a ShutdownContainer request,
// which results in this method being called potentially a second
@ -652,7 +651,7 @@ impl CloudHypervisorInner {
self.state = VmmState::NotReady;
block_on(self.cloud_hypervisor_shutdown()).map_err(|e| anyhow!(e))?;
self.cloud_hypervisor_shutdown().await?;
Ok(())
}

2
src/runtime-rs/crates/hypervisor/src/ch/mod.rs
View File

@ -61,7 +61,7 @@ impl Hypervisor for CloudHypervisor {
async fn stop_vm(&self) -> Result<()> {
let mut inner = self.inner.write().await;
inner.stop_vm()
inner.stop_vm().await
}
async fn wait_vm(&self) -> Result<i32> {