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

vmm: device_manager: Make add_vfio_devices a method

Browse Source 
Remove some in/out parameters and instead rely on them as members of the
&mut self parameter.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-01-29 15:53:12 +00:00
parent d9e1c2cd22
commit dbc09ad0ef
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vmm/src/device_manager.rs
View File

@ -582,14 +582,8 @@ impl DeviceManager {
}
}
let mut vfio_iommu_device_ids = DeviceManager::add_vfio_devices(
vm_info,
&self.address_manager,
&mut pci_bus,
&self._memory_manager,
&mut iommu_device,
interrupt_manager,
)?;
let mut vfio_iommu_device_ids =
self.add_vfio_devices(vm_info, &mut pci_bus, &mut iommu_device, interrupt_manager)?;
iommu_attached_devices.append(&mut vfio_iommu_device_ids);
@ -1372,14 +1366,17 @@ impl DeviceManager {
#[cfg(feature = "pci_support")]
fn add_vfio_devices(
&mut self,
vm_info: &VmInfo,
address_manager: &Arc<AddressManager>,
pci: &mut PciBus,
memory_manager: &Arc<Mutex<MemoryManager>>,
iommu_device: &mut Option<vm_virtio::Iommu>,
interrupt_manager: &Arc<dyn InterruptManager>,
) -> DeviceManagerResult<Vec<u32>> {
let mut mem_slot = memory_manager.lock().unwrap().allocate_kvm_memory_slot();
let mut mem_slot = self
._memory_manager
.lock()
.unwrap()
.allocate_kvm_memory_slot();
let mut iommu_attached_device_ids = Vec::new();
if let Some(device_list_cfg) = &vm_info.vm_cfg.lock().unwrap().devices {
@ -1420,7 +1417,7 @@ impl DeviceManager {
.map_err(DeviceManagerError::VfioPciCreate)?;
let bars = vfio_pci_device
.allocate_bars(&mut address_manager.allocator.lock().unwrap())
.allocate_bars(&mut self.address_manager.allocator.lock().unwrap())
.map_err(DeviceManagerError::AllocateBars)?;
mem_slot = vfio_pci_device
@ -1434,8 +1431,8 @@ impl DeviceManager {
pci.register_mapping(
vfio_pci_device.clone(),
address_manager.io_bus.as_ref(),
address_manager.mmio_bus.as_ref(),
self.address_manager.io_bus.as_ref(),
self.address_manager.mmio_bus.as_ref(),
bars,
)
.map_err(DeviceManagerError::AddPciDevice)?;