Merge pull request #8516 from Apokleos/vsock-dev

move vsock device into device manager
This commit is contained in:
Greg Kurz
2023-12-05 11:28:37 +01:00
committed by GitHub
11 changed files with 152 additions and 61 deletions

View File

@@ -17,7 +17,7 @@ pub mod manager;
mod manager_inner;
pub mod network;
pub mod resource_persist;
use hypervisor::{BlockConfig, HybridVsockConfig};
use hypervisor::{BlockConfig, HybridVsockConfig, VsockConfig};
use network::NetworkConfig;
pub mod rootfs;
pub mod share_fs;
@@ -33,6 +33,7 @@ pub enum ResourceConfig {
ShareFs(SharedFsInfo),
VmRootfs(BlockConfig),
HybridVsock(HybridVsockConfig),
Vsock(VsockConfig),
}
#[derive(Debug, Clone, Copy, PartialEq)]

View File

@@ -134,6 +134,11 @@ impl ResourceManagerInner {
.await
.context("do handle hybrid-vsock device failed.")?;
}
ResourceConfig::Vsock(v) => {
do_handle_device(&self.device_manager, &DeviceConfig::VsockCfg(v))
.await
.context("do handle vsock device failed.")?;
}
};
}