commit 092a1f3fd74f880874f312d78174350c846b1ea3
author Elie Kheirallah <khei@google.com> Tue Mar 21 21:44:43 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 21 21:44:43 2023 +0000
tree 6b60445da83161b7219cf6226a93d2d139a44452
parent 215e4c5c3fe190fd60431cc440de9da7e4faa425
parent 2d12ff37de652f48c51ede48b1b50321bfffd654

Merge "Add as_raw_descriptor to control_server_socket"

virtualizationmanager/src/crosvm.rs

diff --git a/virtualizationmanager/src/crosvm.rs b/virtualizationmanager/src/crosvm.rs
index 9db0971..19f5f01 100644
--- a/virtualizationmanager/src/crosvm.rs
+++ b/virtualizationmanager/src/crosvm.rs
@@ -53,6 +53,7 @@
 use rpcbinder::RpcServer;
 
 /// external/crosvm
+use base::AsRawDescriptor;
 use base::UnixSeqpacketListener;
 use vm_control::{BalloonControlCommand, VmRequest, VmResponse};
 
@@ -823,7 +824,9 @@
 
     let control_server_socket = UnixSeqpacketListener::bind(crosvm_control_socket_path)
         .context("failed to create control server")?;
-    command.arg("--socket").arg(add_preserved_fd(&mut preserved_fds, &control_server_socket));
+    command
+        .arg("--socket")
+        .arg(add_preserved_fd(&mut preserved_fds, &control_server_socket.as_raw_descriptor()));
 
     debug!("Preserving FDs {:?}", preserved_fds);
     command.preserved_fds(preserved_fds);