From 24eeed2b6fb6306f404238d1343db4b55aa9beef Mon Sep 17 00:00:00 2001
From: Daniel Verkamp <dverkamp@chromium.org>
Date: Fri, 1 Nov 2019 10:01:23 -0700
Subject: devices: virtio: pass Interrupt to activate()

Factor out the common creation of struct Interrupt.

No functional change.

BUG=chromium:854765
TEST=./build_test

Change-Id: Idf8804771ba1af5181818f643e15e1b42918258a
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1898268
Tested-by: kokoro <noreply+kokoro@google.com>
---
 devices/src/virtio/virtio_pci_common_config.rs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'devices/src/virtio/virtio_pci_common_config.rs')

diff --git a/devices/src/virtio/virtio_pci_common_config.rs b/devices/src/virtio/virtio_pci_common_config.rs
index d1ea3e8..78af4ff 100644
--- a/devices/src/virtio/virtio_pci_common_config.rs
+++ b/devices/src/virtio/virtio_pci_common_config.rs
@@ -238,11 +238,7 @@ impl VirtioPciCommonConfig {
 mod tests {
     use super::*;
 
-    use crate::pci::MsixConfig;
     use std::os::unix::io::RawFd;
-    use std::sync::atomic::AtomicUsize;
-    use std::sync::Arc;
-    use sync::Mutex;
     use sys_util::{EventFd, GuestMemory};
 
     struct DummyDevice(u32);
@@ -262,10 +258,7 @@ mod tests {
         fn activate(
             &mut self,
             _mem: GuestMemory,
-            _interrupt_evt: EventFd,
-            _interrupt_resample_evt: EventFd,
-            _msix_config: Option<Arc<Mutex<MsixConfig>>>,
-            _status: Arc<AtomicUsize>,
+            _interrupt: Interrupt,
             _queues: Vec<Queue>,
             _queue_evts: Vec<EventFd>,
         ) {
-- 
cgit 1.4.1