summary refs log tree commit diff
path: root/devices/src/virtio/virtio_pci_common_config.rs
diff options
context:
space:
mode:
authorDaniel Verkamp <dverkamp@chromium.org>2019-11-01 10:01:23 -0700
committerCommit Bot <commit-bot@chromium.org>2019-11-18 07:43:03 +0000
commit24eeed2b6fb6306f404238d1343db4b55aa9beef (patch)
tree0a347754994d470b3df3e3811430b4da6758ea17 /devices/src/virtio/virtio_pci_common_config.rs
parente7c46cad4150ecb18a0832a61042522974543938 (diff)
downloadcrosvm-24eeed2b6fb6306f404238d1343db4b55aa9beef.tar
crosvm-24eeed2b6fb6306f404238d1343db4b55aa9beef.tar.gz
crosvm-24eeed2b6fb6306f404238d1343db4b55aa9beef.tar.bz2
crosvm-24eeed2b6fb6306f404238d1343db4b55aa9beef.tar.lz
crosvm-24eeed2b6fb6306f404238d1343db4b55aa9beef.tar.xz
crosvm-24eeed2b6fb6306f404238d1343db4b55aa9beef.tar.zst
crosvm-24eeed2b6fb6306f404238d1343db4b55aa9beef.zip
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>
Diffstat (limited to 'devices/src/virtio/virtio_pci_common_config.rs')
-rw-r--r--devices/src/virtio/virtio_pci_common_config.rs9
1 files changed, 1 insertions, 8 deletions
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>,
         ) {