diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-03-11 20:36:11 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-06-15 09:36:22 +0000 |
commit | 9ecffa4880b741d0de23c6d0ee4755bd66db01fb (patch) | |
tree | 324b1ef3442d2f2ecc7113a1b9d311641e99bbed /src | |
parent | 4140a7d1871bae2d73a1fe6955af75ac07e7e86f (diff) | |
download | crosvm-9ecffa4880b741d0de23c6d0ee4755bd66db01fb.tar crosvm-9ecffa4880b741d0de23c6d0ee4755bd66db01fb.tar.gz crosvm-9ecffa4880b741d0de23c6d0ee4755bd66db01fb.tar.bz2 crosvm-9ecffa4880b741d0de23c6d0ee4755bd66db01fb.tar.lz crosvm-9ecffa4880b741d0de23c6d0ee4755bd66db01fb.tar.xz crosvm-9ecffa4880b741d0de23c6d0ee4755bd66db01fb.tar.zst crosvm-9ecffa4880b741d0de23c6d0ee4755bd66db01fb.zip |
drop lazy_static
Diffstat (limited to 'src')
-rw-r--r-- | src/linux.rs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/linux.rs b/src/linux.rs index 286d387..411d529 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -762,8 +762,17 @@ fn create_wayland_device( .collect::<Option<Vec<_>>>() .ok_or(Error::InvalidWaylandPath)?; - let dev = virtio::Controller::new(cfg.wayland_socket_paths.clone(), socket, resource_bridge) - .map_err(Error::WaylandDeviceNew)?; + let mut path = std::env::var("XDG_RUNTIME_DIR").expect("XDG_RUNTIME_DIR missing"); + path.push_str("/crosvm-wl.sock"); + let seq_socket = UnixSeqpacket::connect(&path).expect("connect failed"); + let msg_socket = MsgSocket::new(seq_socket); + let dev = virtio::Controller::new( + cfg.wayland_socket_paths.clone(), + socket, + resource_bridge, + msg_socket, + ) + .map_err(Error::WaylandDeviceNew)?; let jail = match simple_jail(&cfg, "wl_device")? { Some(mut jail) => { |