diff options
Diffstat (limited to 'devices/src/virtio/pmem.rs')
-rw-r--r-- | devices/src/virtio/pmem.rs | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/devices/src/virtio/pmem.rs b/devices/src/virtio/pmem.rs index 07ed137..931b037 100644 --- a/devices/src/virtio/pmem.rs +++ b/devices/src/virtio/pmem.rs @@ -6,18 +6,13 @@ use std::fmt::{self, Display}; use std::fs::File; use std::io; use std::os::unix::io::{AsRawFd, RawFd}; -use std::sync::atomic::AtomicUsize; -use std::sync::Arc; use std::thread; -use sync::Mutex; use sys_util::Result as SysResult; use sys_util::{error, EventFd, GuestAddress, GuestMemory, PollContext, PollToken}; use data_model::{DataInit, Le32, Le64}; -use crate::pci::MsixConfig; - use super::{ copy_config, DescriptorChain, DescriptorError, Interrupt, Queue, Reader, VirtioDevice, Writer, TYPE_PMEM, VIRTIO_F_VERSION_1, @@ -268,10 +263,7 @@ impl VirtioDevice for Pmem { fn activate( &mut self, memory: GuestMemory, - interrupt_event: EventFd, - interrupt_resample_event: EventFd, - msix_config: Option<Arc<Mutex<MsixConfig>>>, - status: Arc<AtomicUsize>, + interrupt: Interrupt, mut queues: Vec<Queue>, mut queue_events: Vec<EventFd>, ) { @@ -297,12 +289,7 @@ impl VirtioDevice for Pmem { .name("virtio_pmem".to_string()) .spawn(move || { let mut worker = Worker { - interrupt: Interrupt::new( - status, - interrupt_event, - interrupt_resample_event, - msix_config, - ), + interrupt, memory, disk_image, queue, |