crosvm: make wl add take socket as fd

1 files changed, 3 insertions, 12 deletions

diff --git a/vm_control/src/lib.rs b/vm_control/src/lib.rs
index b2e328c..f8ffe21 100644
--- a/vm_control/src/lib.rs
+++ b/vm_control/src/lib.rs
@@ -15,7 +15,7 @@ use std::fs::File;
 use std::io::{Seek, SeekFrom};
 use std::mem::ManuallyDrop;
 use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
-use std::path::PathBuf;
+use std::os::unix::net::UnixStream;
 
 use libc::{EINVAL, EIO, ENODEV};
 
@@ -514,25 +514,16 @@ impl VmMsyncRequest {
 
 #[derive(MsgOnSocket, Debug)]
 pub enum WlControlCommand {
-    AddSocket { name: Vec<u8>, path: PathBuf },
+    AddSocket { name: Vec<u8>, socket: UnixStream },
 }
 
 #[derive(MsgOnSocket, Debug)]
 pub enum WlControlResult {
     Ready,
-    Ok,
+    SocketAdded(Vec<u8>),
     Err(SysError),
 }
 
-impl From<Result<()>> for WlControlResult {
-    fn from(result: Result<()>) -> Self {
-        match result {
-            Ok(()) => Self::Ok,
-            Err(e) => Self::Err(e),
-        }
-    }
-}
-
 pub type BalloonControlRequestSocket = MsgSocket<BalloonControlCommand, BalloonControlResult>;
 pub type BalloonControlResponseSocket = MsgSocket<BalloonControlResult, BalloonControlCommand>;