From 89f45363b3c902edaa137e5bc0ada605c604d854 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 27 Mar 2020 16:19:07 +0000
Subject: don't assume two queues

---
 src/wl.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src')

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");
-- 
cgit 1.4.1