github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-02 08:17:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6879 from openanolis/chao/update_upstream_upcall_feature

Browse Source 
Dragonball: optimize the placement of dbs-upcall features
This commit is contained in:
Chao Wu 2023-09-07 18:07:53 +08:00 committed by GitHub
commit cd8c217ee1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dragonball/src/api/v1/vmm_action.rs
View File

@ -692,6 +692,7 @@ impl VmmService {
));
}
#[cfg(feature = "dbs-upcall")]
vm.resize_vcpu(config, None).map_err(|e| {
if let VcpuResizeError::UpcallServerNotReady = e {
return VmmActionError::UpcallServerNotReady;

4
src/dragonball/src/vm/mod.rs
View File

@ -763,7 +763,6 @@ impl Vm {
impl Vm {
#[cfg(feature = "dbs-upcall")]
/// initialize upcall client for guest os
#[cfg(feature = "dbs-upcall")]
fn new_upcall(&mut self) -> std::result::Result<(), StartMicroVmError> {
// get vsock inner connector for upcall
let inner_connector = self
@ -805,7 +804,6 @@ impl Vm {
#[cfg(feature = "dbs-upcall")]
/// Get upcall client.
#[cfg(feature = "dbs-upcall")]
pub fn upcall_client(&self) -> &Option<Arc<UpcallClient<DevMgrService>>> {
&self.upcall_client
}
@ -825,7 +823,7 @@ impl Vm {
}
/// Resize MicroVM vCPU number
#[cfg(feature = "hotplug")]
#[cfg(feature = "dbs-upcall")]
pub fn resize_vcpu(
&mut self,
config: VcpuResizeInfo,