commit 2d12ff37de652f48c51ede48b1b50321bfffd654
author Elie Kheirallah <khei@google.com> Mon Mar 20 18:12:07 2023 +0000
committer Elie Kheirallah <khei@google.com> Mon Mar 20 18:30:46 2023 +0000
tree a90594849e7043cfa182c3d16acade0580af81a6
parent de76d90b76c0409181eace85c5b24dcad74c8ebf

Add as_raw_descriptor to control_server_socket

Crosvm upstream removed AsRawFd from base/src/sys/unix/net.rs and now
implemented, and now UnixSeqpacketListener implements AsRawDescriptor
instead.

Bug: 270404912
Test: m
Change-Id: I76295742a4f59142a9b45f0830b69dff5514560a

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);