From 3e68867bb73a8b6e077a573b124575d07bb761b1 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Wed, 29 Jul 2020 12:09:52 +0000 Subject: [PATCH] vmm: device_manager: eliminate KvmMsiInterruptManager from the new function The logic to create an MSI interrupt manager is applicable to Hyper-V as well. Signed-off-by: Wei Liu --- vmm/src/device_manager.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs index 042f50533..4f4b7ea37 100644 --- a/vmm/src/device_manager.rs +++ b/vmm/src/device_manager.rs @@ -14,7 +14,9 @@ use crate::config::ConsoleOutputMode; use crate::config::DeviceConfig; use crate::config::{DiskConfig, FsConfig, NetConfig, PmemConfig, VmConfig, VsockConfig}; 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}; #[cfg(feature = "pci_support")] use crate::PciDeviceInfo; @@ -813,7 +815,7 @@ impl DeviceManager { // handling a linear dependency chain: // msi_interrupt_manager <- IOAPIC <- legacy_interrupt_manager. let msi_interrupt_manager: Arc> = - Arc::new(KvmMsiInterruptManager::new( + Arc::new(MsiInterruptManager::new( Arc::clone(&address_manager.allocator), vm, ));