| commit | 19b498482a25555af812642ef7f14a9a0df86eea | [log] [tgz] |
|---|---|---|
| author | Seungjae Yoo <seungjaeyoo@google.com> | Mon Jun 17 01:12:42 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 17 01:12:42 2024 +0000 |
| tree | 083f2e94edaa463882ed1eb9e337776c9f903b12 | |
| parent | 6eab1eca967fcf1971caae92949d9b417315f285 [diff] | |
| parent | f1b6ce78d33990e14047dd7afa9f675a8f5ba6f1 [diff] |
Merge "Small fix of type conversion of TUNGETIFF in vmnic" into main am: df7855fb7a am: f1b6ce78d3 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3133395 Change-Id: I34c7399d882799ae8a5e6d24420a7dd5f4527adc 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;