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

hypervisor: Refactor create_passthrough_device() for generic type

Browse Source 
Changed the return type of create_passthrough_device() to generic type
hypervisor::Device.

Signed-off-by: Michael Zhao <michael.zhao@arm.com>
This commit is contained in:
Michael Zhao
2020-07-21 17:56:00 +08:00
committed by Samuel Ortiz
parent 6c8749adf2
commit ddf1b76906
4 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vmm/src/device_manager.rs
+19 -16
View File
@@ -57,6 +57,8 @@ use std::fs::{File, OpenOptions};
use std::io::{self, sink, stdout, Seek, SeekFrom};
use std::num::Wrapping;
use std::os::unix::fs::OpenOptionsExt;
#[cfg(feature = "pci_support")]
use std::os::unix::io::FromRawFd;
use std::path::PathBuf;
use std::result;
use std::sync::{Arc, Mutex};
@@ -745,7 +747,7 @@ pub struct DeviceManager {
// Passthrough device handle
#[cfg(feature = "pci_support")]
passthrough_device: Option<Arc<DeviceFd>>,
passthrough_device: Option<Arc<dyn hypervisor::Device>>,
// Paravirtualized IOMMU
#[cfg(feature = "pci_support")]
@@ -2390,11 +2392,11 @@ impl DeviceManager {
&mut self,
pci: &mut PciBus,
interrupt_manager: &Arc<dyn InterruptManager<GroupConfig = MsiIrqGroupConfig>>,
device_fd: &Arc<DeviceFd>,
device: &Arc<dyn hypervisor::Device>,
device_cfg: &mut DeviceConfig,
) -> DeviceManagerResult<(u32, String)> {
#[cfg(feature = "kvm")]
return self.add_vfio_device(pci, interrupt_manager, device_fd, device_cfg);
return self.add_vfio_device(pci, interrupt_manager, device, device_cfg);
#[cfg(not(feature = "kvm"))]
Err(DeviceManagerError::NoDevicePassthroughSupport)
@@ -2405,7 +2407,7 @@ impl DeviceManager {
&mut self,
pci: &mut PciBus,
interrupt_manager: &Arc<dyn InterruptManager<GroupConfig = MsiIrqGroupConfig>>,
device_fd: &Arc<DeviceFd>,
device: &Arc<dyn hypervisor::Device>,
device_cfg: &mut DeviceConfig,
) -> DeviceManagerResult<(u32, String)> {
// We need to shift the device id since the 3 first bits
@@ -2420,7 +2422,10 @@ impl DeviceManager {
let memory = self.memory_manager.lock().unwrap().guest_memory();
let vfio_container = Arc::new(
VfioContainer::new(device_fd.clone()).map_err(DeviceManagerError::VfioCreate)?,
VfioContainer::new(Arc::new(unsafe {
DeviceFd::from_raw_fd(device.as_raw_fd())
}))
.map_err(DeviceManagerError::VfioCreate)?,
);
let vfio_device = VfioDevice::new(
@@ -2511,17 +2516,16 @@ impl DeviceManager {
if let Some(device_list_cfg) = &mut devices {
// Create the passthrough device handle
let device_fd = self
let device = self
.address_manager
.vm
.create_passthrough_device()
.map_err(|e| DeviceManagerError::CreatePassthroughDevice(e.into()))?;
let device_fd = Arc::new(device_fd);
self.passthrough_device = Some(Arc::clone(&device_fd));
self.passthrough_device = Some(Arc::clone(&device));
for device_cfg in device_list_cfg.iter_mut() {
let (device_id, _) =
self.add_passthrough_device(pci, interrupt_manager, &device_fd, device_cfg)?;
self.add_passthrough_device(pci, interrupt_manager, &device, device_cfg)?;
if device_cfg.iommu && self.iommu_device.is_some() {
iommu_attached_device_ids.push(device_id);
}
@@ -2936,26 +2940,25 @@ impl DeviceManager {
let interrupt_manager = Arc::clone(&self.msi_interrupt_manager);
let device_fd = if let Some(device_fd) = &self.passthrough_device {
Arc::clone(&device_fd)
let device = if let Some(device) = &self.passthrough_device {
Arc::clone(&device)
} else {
// If the passthrough device file descriptor has not been created yet,
// it is created here and stored in the DeviceManager structure for
// future needs.
let device_fd = self
let device = self
.address_manager
.vm
.create_passthrough_device()
.map_err(|e| DeviceManagerError::CreatePassthroughDevice(e.into()))?;
let device_fd = Arc::new(device_fd);
self.passthrough_device = Some(Arc::clone(&device_fd));
device_fd
self.passthrough_device = Some(Arc::clone(&device));
device
};
let (device_id, device_name) = self.add_passthrough_device(
&mut pci.lock().unwrap(),
&interrupt_manager,
&device_fd,
&device,
device_cfg,
)?;