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

vmm: device_manager: eliminate KvmMsiInterruptManager from the new function

Browse Source 
The logic to create an MSI interrupt manager is applicable to Hyper-V as
well.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
Wei Liu 2020-07-29 12:09:52 +00:00 committed by Sebastien Boeuf
parent cf1b5156f4
commit 3e68867bb7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vmm/src/device_manager.rs
View File

@ -14,7 +14,9 @@ use crate::config::ConsoleOutputMode;
use crate::config::DeviceConfig; use crate::config::DeviceConfig;
use crate::config::{DiskConfig, FsConfig, NetConfig, PmemConfig, VmConfig, VsockConfig}; use crate::config::{DiskConfig, FsConfig, NetConfig, PmemConfig, VmConfig, VsockConfig};
use crate::device_tree::{DeviceNode, DeviceTree}; use crate::device_tree::{DeviceNode, DeviceTree};
use crate::interrupt::{kvm::KvmMsiInterruptManager, LegacyUserspaceInterruptManager}; #[cfg(feature = "kvm")]
use crate::interrupt::kvm::KvmMsiInterruptManager as MsiInterruptManager;
use crate::interrupt::LegacyUserspaceInterruptManager;
use crate::memory_manager::{Error as MemoryManagerError, MemoryManager}; use crate::memory_manager::{Error as MemoryManagerError, MemoryManager};
#[cfg(feature = "pci_support")] #[cfg(feature = "pci_support")]
use crate::PciDeviceInfo; use crate::PciDeviceInfo;
@ -813,7 +815,7 @@ impl DeviceManager {
// handling a linear dependency chain: // handling a linear dependency chain:
// msi_interrupt_manager <- IOAPIC <- legacy_interrupt_manager. // msi_interrupt_manager <- IOAPIC <- legacy_interrupt_manager.
let msi_interrupt_manager: Arc<dyn InterruptManager<GroupConfig = MsiIrqGroupConfig>> = let msi_interrupt_manager: Arc<dyn InterruptManager<GroupConfig = MsiIrqGroupConfig>> =
Arc::new(KvmMsiInterruptManager::new( Arc::new(MsiInterruptManager::new(
Arc::clone(&address_manager.allocator), Arc::clone(&address_manager.allocator),
vm, vm,
)); ));