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

vmm: interrupt: drop Kvm prefix from KvmLegacyUserspaceInterruptManager

Browse Source 
This data structure doesn't contain KVM specific stuff.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
Wei Liu
2020-06-25 14:56:49 +00:00
committed by Rob Bradford
parent 574cab6990
commit 637f58bcd9
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vmm/src/device_manager.rs
View File

@@ -14,7 +14,7 @@ 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::{KvmLegacyUserspaceInterruptManager, KvmMsiInterruptManager}; use crate::interrupt::{KvmMsiInterruptManager, 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;
@@ -865,7 +865,7 @@ impl DeviceManager {
// formed IOAPIC device. // formed IOAPIC device.
let legacy_interrupt_manager: Arc< let legacy_interrupt_manager: Arc<
dyn InterruptManager<GroupConfig = LegacyIrqGroupConfig>, dyn InterruptManager<GroupConfig = LegacyIrqGroupConfig>,
> = Arc::new(KvmLegacyUserspaceInterruptManager::new(Arc::clone( > = Arc::new(LegacyUserspaceInterruptManager::new(Arc::clone(
&interrupt_controller, &interrupt_controller,
))); )));

8
vmm/src/interrupt.rs
View File

@@ -310,7 +310,7 @@ impl InterruptSourceGroup for LegacyUserspaceInterruptGroup {
} }
} }
pub struct KvmLegacyUserspaceInterruptManager { pub struct LegacyUserspaceInterruptManager {
ioapic: Arc<Mutex<dyn InterruptController>>, ioapic: Arc<Mutex<dyn InterruptController>>,
} }
@@ -320,9 +320,9 @@ pub struct KvmMsiInterruptManager {
gsi_msi_routes: Arc<Mutex<HashMap<u32, KvmRoutingEntry>>>, gsi_msi_routes: Arc<Mutex<HashMap<u32, KvmRoutingEntry>>>,
} }
impl KvmLegacyUserspaceInterruptManager { impl LegacyUserspaceInterruptManager {
pub fn new(ioapic: Arc<Mutex<dyn InterruptController>>) -> Self { pub fn new(ioapic: Arc<Mutex<dyn InterruptController>>) -> Self {
KvmLegacyUserspaceInterruptManager { ioapic } LegacyUserspaceInterruptManager { ioapic }
} }
} }
@@ -342,7 +342,7 @@ impl KvmMsiInterruptManager {
} }
} }
impl InterruptManager for KvmLegacyUserspaceInterruptManager { impl InterruptManager for LegacyUserspaceInterruptManager {
type GroupConfig = LegacyIrqGroupConfig; type GroupConfig = LegacyIrqGroupConfig;
fn create_group( fn create_group(