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

vmm: Store MSI InterruptManager from DeviceManager

Browse Source 
Helps with future refactoring of VFIO device creation.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2020-02-27 18:10:30 +01:00 committed by Rob Bradford
parent 02adc4061a
commit d9c1b4396e
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vm-device/src/interrupt/mod.rs
View File

@ -118,7 +118,7 @@ pub struct MsiIrqGroupConfig {
/// ///
/// The InterruptManager implementations should protect itself from concurrent accesses internally, /// The InterruptManager implementations should protect itself from concurrent accesses internally,
/// so it could be invoked from multi-threaded context. /// so it could be invoked from multi-threaded context.
pub trait InterruptManager { pub trait InterruptManager: Send + Sync {
type GroupConfig; type GroupConfig;
/// Create an [InterruptSourceGroup](trait.InterruptSourceGroup.html) object to manage /// Create an [InterruptSourceGroup](trait.InterruptSourceGroup.html) object to manage

17
vmm/src/device_manager.rs
View File

@ -433,6 +433,10 @@ pub struct DeviceManager {
// Keep a reference to the PCI bus // Keep a reference to the PCI bus
#[cfg(feature = "pci_support")] #[cfg(feature = "pci_support")]
pci_bus: Option<Arc<Mutex<PciBus>>>, pci_bus: Option<Arc<Mutex<PciBus>>>,
// MSI Interrupt Manager
#[cfg(feature = "pci_support")]
msi_interrupt_manager: Arc<dyn InterruptManager<GroupConfig = MsiIrqGroupConfig>>,
} }
impl DeviceManager { impl DeviceManager {
@ -521,6 +525,8 @@ impl DeviceManager {
vhost_user_backends: Vec::new(), vhost_user_backends: Vec::new(),
#[cfg(feature = "pci_support")] #[cfg(feature = "pci_support")]
pci_bus: None, pci_bus: None,
#[cfg(feature = "pci_support")]
msi_interrupt_manager: Arc::clone(&msi_interrupt_manager),
}; };
device_manager device_manager
@ -542,7 +548,7 @@ impl DeviceManager {
virtio_devices.append(&mut device_manager.make_virtio_devices()?); virtio_devices.append(&mut device_manager.make_virtio_devices()?);
if cfg!(feature = "pci_support") { if cfg!(feature = "pci_support") {
device_manager.add_pci_devices(virtio_devices.clone(), &msi_interrupt_manager)?; device_manager.add_pci_devices(virtio_devices.clone())?;
} else if cfg!(feature = "mmio_support") { } else if cfg!(feature = "mmio_support") {
device_manager.add_mmio_devices(virtio_devices.clone(), &legacy_interrupt_manager)?; device_manager.add_mmio_devices(virtio_devices.clone(), &legacy_interrupt_manager)?;
} }
@ -576,7 +582,6 @@ impl DeviceManager {
fn add_pci_devices( fn add_pci_devices(
&mut self, &mut self,
virtio_devices: Vec<(Arc<Mutex<dyn vm_virtio::VirtioDevice>>, bool)>, virtio_devices: Vec<(Arc<Mutex<dyn vm_virtio::VirtioDevice>>, bool)>,
interrupt_manager: &Arc<dyn InterruptManager<GroupConfig = MsiIrqGroupConfig>>,
) -> DeviceManagerResult<()> { ) -> DeviceManagerResult<()> {
#[cfg(feature = "pci_support")] #[cfg(feature = "pci_support")]
{ {
@ -594,6 +599,8 @@ impl DeviceManager {
(None, None) (None, None)
}; };
let interrupt_manager = Arc::clone(&self.msi_interrupt_manager);
let mut iommu_attached_devices = Vec::new(); let mut iommu_attached_devices = Vec::new();
for (device, iommu_attached) in virtio_devices { for (device, iommu_attached) in virtio_devices {
@ -604,7 +611,7 @@ impl DeviceManager {
}; };
let virtio_iommu_attach_dev = let virtio_iommu_attach_dev =
self.add_virtio_pci_device(device, &mut pci_bus, mapping, interrupt_manager)?; self.add_virtio_pci_device(device, &mut pci_bus, mapping, &interrupt_manager)?;
if let Some(dev_id) = virtio_iommu_attach_dev { if let Some(dev_id) = virtio_iommu_attach_dev {
iommu_attached_devices.push(dev_id); iommu_attached_devices.push(dev_id);
@ -612,7 +619,7 @@ impl DeviceManager {
} }
let mut vfio_iommu_device_ids = let mut vfio_iommu_device_ids =
self.add_vfio_devices(&mut pci_bus, &mut iommu_device, interrupt_manager)?; self.add_vfio_devices(&mut pci_bus, &mut iommu_device, &interrupt_manager)?;
iommu_attached_devices.append(&mut vfio_iommu_device_ids); iommu_attached_devices.append(&mut vfio_iommu_device_ids);
@ -626,7 +633,7 @@ impl DeviceManager {
Arc::new(Mutex::new(iommu_device)), Arc::new(Mutex::new(iommu_device)),
&mut pci_bus, &mut pci_bus,
&None, &None,
interrupt_manager, &interrupt_manager,
)?; )?;
} }