diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-03-13 04:49:34 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-06-15 09:36:32 +0000 |
| commit | c8ea9a839e28254474000729fa522b51fa860925 (patch) | |
| tree | eebdcaf1556ce8882552f21efa686d21813c67f4 /src/linux.rs | |
| parent | 29dd8155e7bf1698a035b1f17be6e9cc225e7445 (diff) | |
| download | crosvm-c8ea9a839e28254474000729fa522b51fa860925.tar crosvm-c8ea9a839e28254474000729fa522b51fa860925.tar.gz crosvm-c8ea9a839e28254474000729fa522b51fa860925.tar.bz2 crosvm-c8ea9a839e28254474000729fa522b51fa860925.tar.lz crosvm-c8ea9a839e28254474000729fa522b51fa860925.tar.xz crosvm-c8ea9a839e28254474000729fa522b51fa860925.tar.zst crosvm-c8ea9a839e28254474000729fa522b51fa860925.zip | |
poly_msg_socket
we're gonna need this to send all of VirtioDevice over a socket
Diffstat (limited to 'src/linux.rs')
| -rw-r--r-- | src/linux.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/linux.rs b/src/linux.rs index 6f0e19b..7cb4b9c 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -40,6 +40,7 @@ use io_jail::{self, Minijail}; use kvm::*; use msg_socket::{MsgError, MsgReceiver, MsgResult, MsgSender, MsgSocket}; use net_util::{Error as NetError, MacAddress, Tap}; +use poly_msg_socket::PolyMsgSocket; use remain::sorted; use resources::{Alloc, MmioType, SystemAllocator}; use sync::{Condvar, Mutex}; @@ -85,7 +86,7 @@ pub enum Error { BuildVm(<Arch as LinuxArch>::Error), ChownTpmStorage(sys_util::Error), CloneEventFd(sys_util::Error), - ControllerCreate(MsgError), + ControllerCreate(poly_msg_socket::Error), CreateAc97(devices::PciDeviceError), CreateConsole(arch::serial::Error), CreateDiskError(disk::Error), @@ -767,7 +768,7 @@ fn create_wayland_device( 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 msg_socket = PolyMsgSocket::new(seq_socket); let dev = virtio::Controller::create( cfg.wayland_socket_paths.clone(), socket, |