kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Add valid FDs for TAP devices to 'VmConfig::preserved_fds'

Browse Source 
In this way, valid FDs for TAP devices will be closed when the holding
VmConfig instance is destroyed.

Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
Bo Chen
2023-04-14 17:47:58 -07:00
committed by Bo Chen
parent 3227372fe0
commit d656058c21
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vmm/src/device_manager.rs
+22 -17
View File
@@ -2317,23 +2317,28 @@ impl DeviceManager {
.map_err(DeviceManagerError::CreateVirtioNet)?, .map_err(DeviceManagerError::CreateVirtioNet)?,
)) ))
} else if let Some(fds) = &net_cfg.fds { } else if let Some(fds) = &net_cfg.fds {
Arc::new(Mutex::new( let net = virtio_devices::Net::from_tap_fds(
virtio_devices::Net::from_tap_fds( id.clone(),
id.clone(), fds,
fds, Some(net_cfg.mac),
Some(net_cfg.mac), net_cfg.mtu,
net_cfg.mtu, self.force_iommu | net_cfg.iommu,
self.force_iommu | net_cfg.iommu, net_cfg.queue_size,
net_cfg.queue_size, self.seccomp_action.clone(),
self.seccomp_action.clone(), net_cfg.rate_limiter_config,
net_cfg.rate_limiter_config, self.exit_evt
self.exit_evt .try_clone()
.try_clone() .map_err(DeviceManagerError::EventFd)?,
.map_err(DeviceManagerError::EventFd)?, state,
state, )
) .map_err(DeviceManagerError::CreateVirtioNet)?;
.map_err(DeviceManagerError::CreateVirtioNet)?,
)) // SAFETY: 'fds' are valid because TAP devices are created successfully
unsafe {
self.config.lock().unwrap().add_preserved_fds(fds.clone());
}
Arc::new(Mutex::new(net))
} else { } else {
Arc::new(Mutex::new( Arc::new(Mutex::new(
virtio_devices::Net::new( virtio_devices::Net::new(