diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-03-27 16:19:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-06-15 09:37:23 +0000 |
commit | 89f45363b3c902edaa137e5bc0ada605c604d854 (patch) | |
tree | 7743c32cbd41129c4007fc565cbfb844bcdcdb4a /src | |
parent | 98d69a42870030ad533dd8eda5da817430c2b71c (diff) | |
download | crosvm-89f45363b3c902edaa137e5bc0ada605c604d854.tar crosvm-89f45363b3c902edaa137e5bc0ada605c604d854.tar.gz crosvm-89f45363b3c902edaa137e5bc0ada605c604d854.tar.bz2 crosvm-89f45363b3c902edaa137e5bc0ada605c604d854.tar.lz crosvm-89f45363b3c902edaa137e5bc0ada605c604d854.tar.xz crosvm-89f45363b3c902edaa137e5bc0ada605c604d854.tar.zst crosvm-89f45363b3c902edaa137e5bc0ada605c604d854.zip |
don't assume two queues
Diffstat (limited to 'src')
-rw-r--r-- | src/wl.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/wl.rs b/src/wl.rs index 8ae8856..bf8989e 100644 --- a/src/wl.rs +++ b/src/wl.rs @@ -7,6 +7,7 @@ use devices::virtio::{ use msg_socket::MsgSocket; use std::fs::remove_file; use sys_util::{error, net::UnixSeqpacketListener, GuestMemory}; +use vm_control::MaybeOwnedFd; #[cfg(any(target_arch = "arm", target_arch = "aarch64"))] pub use aarch64::arch_memory_regions; @@ -92,10 +93,8 @@ fn main() { shm, interrupt, interrupt_resample_evt, - in_queue, - out_queue, - in_queue_evt, - out_queue_evt, + queues, + queue_evts, }) => { let shm = shm.owned(); @@ -112,8 +111,8 @@ fn main() { interrupt, interrupt_resample_evt.owned(), )), - vec![in_queue, out_queue], - vec![in_queue_evt.owned(), out_queue_evt.owned()], + queues, + queue_evts.into_iter().map(MaybeOwnedFd::owned).collect(), ); println!("activated Wl"); |