| commit | f1b6ce78d33990e14047dd7afa9f675a8f5ba6f1 | [log] [tgz] |
|---|---|---|
| author | Seungjae Yoo <seungjaeyoo@google.com> | Mon Jun 17 01:03:09 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 17 01:03:09 2024 +0000 |
| tree | 083f2e94edaa463882ed1eb9e337776c9f903b12 | |
| parent | 9b310aaf3d8a5fb17f0c9f51b47c1d3d4d096f35 [diff] | |
| parent | df7855fb7a56841c9a05db89a0bb3e7f781111ff [diff] |
Merge "Small fix of type conversion of TUNGETIFF in vmnic" into main am: df7855fb7a Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3133395 Change-Id: I8d4483c06f1cb784ea51bfaa5e6646c19da293f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/virtualizationservice/vmnic/src/aidl.rs b/virtualizationservice/vmnic/src/aidl.rs index 69c37b8..cce34f2 100644 --- a/virtualizationservice/vmnic/src/aidl.rs +++ b/virtualizationservice/vmnic/src/aidl.rs
@@ -27,7 +27,7 @@ use std::os::fd::{AsRawFd, RawFd}; use std::slice::from_raw_parts; -const TUNGETIFF: ioctl_num_type = 0x800454d2u32 as c_int; +const TUNGETIFF: ioctl_num_type = 0x800454d2u32 as ioctl_num_type; const TUNSETIFF: ioctl_num_type = 0x400454ca; const TUNSETPERSIST: ioctl_num_type = 0x400454cb; const SIOCSIFFLAGS: ioctl_num_type = 0x00008914;