From a20b383be8fdac7e8b67190181b5f2ec925ccd00 Mon Sep 17 00:00:00 2001
From: Sebastien Boeuf <sebastien.boeuf@intel.com>
Date: Mon, 20 Jan 2020 16:16:27 +0100
Subject: [PATCH] vmm: Always use a reference for InterruptManager

Since the InterruptManager is never stored into any structure, it should
be passed as a reference instead of being cloned.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
---
 vmm/src/device_manager.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs
index cb53219c6..ff4bb175b 100644
--- a/vmm/src/device_manager.rs
+++ b/vmm/src/device_manager.rs
@@ -472,7 +472,7 @@ impl DeviceManager {
                 &memory_manager,
                 &mut virt_iommu,
                 virtio_devices,
-                interrupt_manager.clone(),
+                &interrupt_manager,
                 &mut migratable_devices,
             )?;
         } else if cfg!(feature = "mmio_support") {
@@ -522,7 +522,7 @@ impl DeviceManager {
         memory_manager: &Arc<Mutex<MemoryManager>>,
         virt_iommu: &mut Option<(u32, Vec<u32>)>,
         virtio_devices: Vec<(Arc<Mutex<dyn vm_virtio::VirtioDevice>>, bool)>,
-        interrupt_manager: Arc<dyn InterruptManager>,
+        interrupt_manager: &Arc<dyn InterruptManager>,
         migratable_devices: &mut Vec<Arc<Mutex<dyn Migratable>>>,
     ) -> DeviceManagerResult<()> {
         #[cfg(feature = "pci_support")]
@@ -558,7 +558,7 @@ impl DeviceManager {
                     &mut pci_bus,
                     mapping,
                     migratable_devices,
-                    &interrupt_manager,
+                    interrupt_manager,
                 )?;
 
                 if let Some(dev_id) = virtio_iommu_attach_dev {
@@ -572,7 +572,7 @@ impl DeviceManager {
                 &mut pci_bus,
                 memory_manager,
                 &mut iommu_device,
-                &interrupt_manager,
+                interrupt_manager,
             )?;
 
             iommu_attached_devices.append(&mut vfio_iommu_device_ids);
@@ -596,7 +596,7 @@ impl DeviceManager {
                     &mut pci_bus,
                     &None,
                     migratable_devices,
-                    &interrupt_manager,
+                    interrupt_manager,
                 )?;
 
                 *virt_iommu = Some((iommu_id, iommu_attached_devices));
@@ -1379,7 +1379,7 @@ impl DeviceManager {
                 }
 
                 let mut vfio_pci_device =
-                    VfioPciDevice::new(vm_info.vm_fd, vfio_device, &interrupt_manager)
+                    VfioPciDevice::new(vm_info.vm_fd, vfio_device, interrupt_manager)
                         .map_err(DeviceManagerError::VfioPciCreate)?;
 
                 let bars = vfio_pci_device