External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-01 02:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: device_manager: Factorize passthrough_device creation

Browse Source 
There's no need to have the code creating the passthrough_device being
duplicated since we can factorize it in a function used in both cases
(both cold plugged and hot plugged devices VFIO devices).

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2021-03-22 10:10:12 +01:00
parent f6da2bb5e1
commit 1e11e6789a
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vmm/src/device_manager.rs
View File

@ -2758,6 +2758,17 @@ impl DeviceManager {
pci: &mut PciBus,
device_cfg: &mut DeviceConfig,
) -> DeviceManagerResult<(u32, String)> {
// If the passthrough device has not been created yet, it is created
// here and stored in the DeviceManager structure for future needs.
if self.passthrough_device.is_none() {
self.passthrough_device = Some(
self.address_manager
.vm
.create_passthrough_device()
.map_err(|e| DeviceManagerError::CreatePassthroughDevice(e.into()))?,
);
}
#[cfg(feature = "kvm")]
return self.add_vfio_device(pci, device_cfg);
@ -2959,16 +2970,6 @@ impl DeviceManager {
let mut devices = self.config.lock().unwrap().devices.clone();
if let Some(device_list_cfg) = &mut devices {
if self.passthrough_device.is_none() {
// Create the passthrough device.
self.passthrough_device = Some(
self.address_manager
.vm
.create_passthrough_device()
.map_err(|e| DeviceManagerError::CreatePassthroughDevice(e.into()))?,
);
}
for device_cfg in device_list_cfg.iter_mut() {
let (device_id, _) = self.add_passthrough_device(pci, device_cfg)?;
if device_cfg.iommu && self.iommu_device.is_some() {
@ -3229,17 +3230,6 @@ impl DeviceManager {
return Err(DeviceManagerError::NoPciBus);
};
if self.passthrough_device.is_none() {
// If the passthrough device has not been created yet, it is created
// here and stored in the DeviceManager structure for future needs.
self.passthrough_device = Some(
self.address_manager
.vm
.create_passthrough_device()
.map_err(|e| DeviceManagerError::CreatePassthroughDevice(e.into()))?,
);
}
let (device_id, device_name) =
self.add_passthrough_device(&mut pci.lock().unwrap(), device_cfg)?;