From 637f58bcd99a4d280e87e807fef6baef10538d3e Mon Sep 17 00:00:00 2001
From: Wei Liu <liuwe@microsoft.com>
Date: Thu, 25 Jun 2020 14:56:49 +0000
Subject: [PATCH] vmm: interrupt: drop Kvm prefix from
 KvmLegacyUserspaceInterruptManager

This data structure doesn't contain KVM specific stuff.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
---
 vmm/src/device_manager.rs | 4 ++--
 vmm/src/interrupt.rs      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs
index 7b1999930..becd2a98c 100644
--- a/vmm/src/device_manager.rs
+++ b/vmm/src/device_manager.rs
@@ -14,7 +14,7 @@ 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::{KvmLegacyUserspaceInterruptManager, KvmMsiInterruptManager};
+use crate::interrupt::{KvmMsiInterruptManager, LegacyUserspaceInterruptManager};
 use crate::memory_manager::{Error as MemoryManagerError, MemoryManager};
 #[cfg(feature = "pci_support")]
 use crate::PciDeviceInfo;
@@ -865,7 +865,7 @@ impl DeviceManager {
         // formed IOAPIC device.
         let legacy_interrupt_manager: Arc<
             dyn InterruptManager<GroupConfig = LegacyIrqGroupConfig>,
-        > = Arc::new(KvmLegacyUserspaceInterruptManager::new(Arc::clone(
+        > = Arc::new(LegacyUserspaceInterruptManager::new(Arc::clone(
             &interrupt_controller,
         )));
 
diff --git a/vmm/src/interrupt.rs b/vmm/src/interrupt.rs
index 868042774..52a90f80d 100644
--- a/vmm/src/interrupt.rs
+++ b/vmm/src/interrupt.rs
@@ -310,7 +310,7 @@ impl InterruptSourceGroup for LegacyUserspaceInterruptGroup {
     }
 }
 
-pub struct KvmLegacyUserspaceInterruptManager {
+pub struct LegacyUserspaceInterruptManager {
     ioapic: Arc<Mutex<dyn InterruptController>>,
 }
 
@@ -320,9 +320,9 @@ pub struct KvmMsiInterruptManager {
     gsi_msi_routes: Arc<Mutex<HashMap<u32, KvmRoutingEntry>>>,
 }
 
-impl KvmLegacyUserspaceInterruptManager {
+impl LegacyUserspaceInterruptManager {
     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;
 
     fn create_group(