commit a2d21d6b27123fa9e455e26e8538e3c8ec5e5d3b
author Elie Kheirallah <khei@google.com> Tue Mar 21 22:59:15 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 21 22:59:15 2023 +0000
tree 6b60445da83161b7219cf6226a93d2d139a44452
parent c13b13ceeaa4944114a26c8c97bf129bd65f9dc9
parent 43522a6646e3ed9fc31881496a314dc484a6b21f

Merge "Add as_raw_descriptor to control_server_socket" am: 092a1f3fd7 am: 43522a6646

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2497056

Change-Id: Ie447fc4142633615ae34f44ec2fc8fae7af2456c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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