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 make_virtio_devices a method

Browse Source 
Remove some in/out parameters and instead rely on them as members of the
&mut self parameter. A follow-up commit will change the callee functions
that create the devices themselves.

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 dbc09ad0ef
commit e90c6f3c44
1 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
vmm/src/device_manager.rs
View File

@ -411,7 +411,7 @@ impl DeviceManager {
let mmio_bus = devices::Bus::new();
let mut virtio_devices: Vec<(Arc<Mutex<dyn vm_virtio::VirtioDevice>>, bool)> = Vec::new();
let mut migratable_devices: Vec<Arc<Mutex<dyn Migratable>>> = Vec::new();
let migratable_devices: Vec<Arc<Mutex<dyn Migratable>>> = Vec::new();
let mut _mmap_regions = Vec::new();
#[allow(unused_mut)]
@ -472,15 +472,6 @@ impl DeviceManager {
&mut virtio_devices,
)?;
#[cfg(any(feature = "pci_support", feature = "mmio_support"))]
virtio_devices.append(&mut DeviceManager::make_virtio_devices(
vm_info,
&address_manager,
&_memory_manager,
&mut _mmap_regions,
&mut migratable_devices,
)?);
DeviceManager::add_legacy_devices(
vm_info,
&address_manager,
@ -527,6 +518,9 @@ impl DeviceManager {
_memory_manager,
};
#[cfg(any(feature = "pci_support", feature = "mmio_support"))]
virtio_devices.append(&mut device_manager.make_virtio_devices(vm_info)?);
if cfg!(feature = "pci_support") {
device_manager.add_pci_devices(vm_info, virtio_devices, &interrupt_manager)?;
} else if cfg!(feature = "mmio_support") {
@ -852,63 +846,60 @@ impl DeviceManager {
}
fn make_virtio_devices(
&mut self,
vm_info: &VmInfo,
address_manager: &Arc<AddressManager>,
memory_manager: &Arc<Mutex<MemoryManager>>,
mmap_regions: &mut Vec<MmapRegion>,
migratable_devices: &mut Vec<Arc<Mutex<dyn Migratable>>>,
) -> DeviceManagerResult<Vec<(VirtioDeviceArc, bool)>> {
let mut allocator = address_manager.allocator.lock().unwrap();
let mut allocator = self.address_manager.allocator.lock().unwrap();
let mut devices: Vec<(Arc<Mutex<dyn vm_virtio::VirtioDevice>>, bool)> = Vec::new();
// Create "standard" virtio devices (net/block/rng)
devices.append(&mut DeviceManager::make_virtio_block_devices(
vm_info,
migratable_devices,
&mut self.migratable_devices,
)?);
devices.append(&mut DeviceManager::make_virtio_net_devices(
vm_info,
migratable_devices,
&mut self.migratable_devices,
)?);
devices.append(&mut DeviceManager::make_virtio_rng_devices(
vm_info,
migratable_devices,
&mut self.migratable_devices,
)?);
// Add virtio-fs if required
devices.append(&mut DeviceManager::make_virtio_fs_devices(
vm_info,
&mut allocator,
memory_manager,
mmap_regions,
migratable_devices,
&self._memory_manager,
&mut self._mmap_regions,
&mut self.migratable_devices,
)?);
// Add virtio-pmem if required
devices.append(&mut DeviceManager::make_virtio_pmem_devices(
vm_info,
&mut allocator,
memory_manager,
mmap_regions,
migratable_devices,
&self._memory_manager,
&mut self._mmap_regions,
&mut self.migratable_devices,
)?);
// Add virtio-vhost-user-net if required
devices.append(&mut DeviceManager::make_virtio_vhost_user_net_devices(
vm_info,
migratable_devices,
&mut self.migratable_devices,
)?);
// Add virtio-vhost-user-blk if required
devices.append(&mut DeviceManager::make_virtio_vhost_user_blk_devices(
vm_info,
migratable_devices,
&mut self.migratable_devices,
)?);
// Add virtio-vsock if required
devices.append(&mut DeviceManager::make_virtio_vsock_devices(
vm_info,
migratable_devices,
&mut self.migratable_devices,
)?);
Ok(devices)