| commit | a1603a59dc03aa6137712c0c3b811ae6f031794a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Aug 22 18:19:15 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 22 18:19:15 2024 +0000 |
| tree | b33b75f75d05aafe05890172065dc567e8187838 | |
| parent | bcc3fb5ba928632e634ffd784a05fb46a974782d [diff] | |
| parent | 2d28dc1311188adba5d62284ec8c882b3d87c2d1 [diff] |
Merge "Fixes --net tap-fd=... format to pass a numeric i32 file descriptor" into main am: 1ad488412e am: 2d28dc1311 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3236957 Change-Id: I6927313f4495f4d3b164d9e9d451f88d44d2bfaf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/android/virtmgr/src/crosvm.rs b/android/virtmgr/src/crosvm.rs index 37618c7..cb2ad2d 100644 --- a/android/virtmgr/src/crosvm.rs +++ b/android/virtmgr/src/crosvm.rs
@@ -1103,9 +1103,9 @@ if cfg!(network) { if let Some(tap) = config.tap { - command - .arg("--net") - .arg(format!("tap-fd={}", add_preserved_fd(&mut preserved_fds, tap))); + add_preserved_fd(&mut preserved_fds, tap); + let tap_fd = preserved_fds.last().unwrap().as_raw_fd(); + command.arg("--net").arg(format!("tap-fd={tap_fd}")); } }