github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-11-03 19:15:58 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: ch: Only handle particular pending device types

Browse Source 
Modify the Cloud Hypervisor `add_device()` method to add `ShareFs` and
`Network` devices to the list of pending devices since only these two
device types need to be cached before VM startup. Full details in the
comments.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
This commit is contained in:
James O. D. Hunt
2023-09-25 11:22:51 +01:00
parent b1b96a5c49
commit 995f2c015f
1 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/runtime-rs/crates/hypervisor/src/ch/inner_device.rs
View File

@@ -26,7 +26,37 @@ const DEFAULT_DISK_QUEUE_SIZE: u16 = 1024;
impl CloudHypervisorInner {
pub(crate) async fn add_device(&mut self, device: DeviceType) -> Result<()> {
if self.state != VmmState::VmRunning {
self.pending_devices.insert(0, device);
// If the VM is not running, add the device to the pending list to
// be handled later.
//
// Note that the only device types considered are DeviceType::ShareFs
// and DeviceType::Network since:
//
// - ShareFs (virtiofsd) is only needed in an non-DM and non-TDX scenario
// for the container rootfs.
//
// - For all other scenarios, the container rootfs is handled by a
// DeviceType::Block and this method is called *after* the VM
// has started so the device does not need to be added to the
// pending list.
//
// - The VM rootfs is handled without waiting for calls to this
// method as the file in question (image= or initrd=) is available
// from HypervisorConfig.BootInfo.{image,initrd}
// (see 'convert.rs').
//
// - Network details need to be saved for later application.
//
match device {
DeviceType::ShareFs(_) => self.pending_devices.insert(0, device),
DeviceType::Network(_) => self.pending_devices.insert(0, device),
_ => {
debug!(
sl!(),
"ignoring early add device request for device: {:?}", device
);
}
}
return Ok(());
}