diff options
Diffstat (limited to 'src/wl.rs')
-rw-r--r-- | src/wl.rs | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/src/wl.rs b/src/wl.rs index 1874929..77cf86c 100644 --- a/src/wl.rs +++ b/src/wl.rs @@ -5,7 +5,6 @@ use msg_socket::{MsgReceiver, MsgSender, MsgSocket}; use std::collections::BTreeMap; use std::fs::remove_file; use sys_util::{error, net::UnixSeqpacketListener, warn, GuestMemory}; -use vm_control::VmMemoryControlRequestSocket; #[cfg(any(target_arch = "arm", target_arch = "aarch64"))] pub use aarch64::{arch_memory_regions, MemoryParams}; @@ -28,7 +27,22 @@ fn main() { let conn = server.accept().expect("accept failed"); let msg_socket: Socket = MsgSocket::new(conn); - let mut wl = None; + let vm_socket = match msg_socket.recv() { + Ok(Request::Create { vm_socket }) => MsgSocket::new(vm_socket.owned()), + + Ok(msg) => { + panic!("received unexpected message: {:?}", msg); + } + + Err(e) => { + panic!("recv error: {}", e); + } + }; + + let mut wayland_paths = BTreeMap::new(); + wayland_paths.insert("".into(), "/run/user/1000/wayland-0".into()); + + let mut wl = Some(Wl::new(wayland_paths, vm_socket, None).unwrap()); loop { match msg_socket.recv() { @@ -52,14 +66,9 @@ fn main() { interrupt_resample_evt, in_queue, out_queue, - vm_socket, in_queue_evt, out_queue_evt, }) => { - if wl.is_some() { - panic!("Received Activate twice"); - } - let shm = shm.owned(); let regions = arch_memory_regions(MemoryParams { @@ -71,16 +80,8 @@ fn main() { let interrupt: MsgSocket<InterruptProxyEvent, ()> = MsgSocket::new(interrupt.owned()); - let vm_socket: VmMemoryControlRequestSocket = MsgSocket::new(vm_socket.owned()); - - let mut wayland_paths = BTreeMap::new(); - wayland_paths.insert("".into(), "/run/user/1000/wayland-0".into()); - - let mut wl_ = Wl::new(wayland_paths, vm_socket, None).unwrap(); - println!("constructed Wl"); - - wl_.activate( + wl.as_mut().unwrap().activate( mem, Box::new(InterruptProxy::new( interrupt, @@ -91,11 +92,11 @@ fn main() { ); println!("activated Wl"); - - wl = Some(wl_); } - Err(e) => panic!("recv failed {:?}", e), + Ok(msg) => panic!("unexpected message {:?}", msg), + + Err(e) => panic!("recv failed: {}", e), } } } |