commit 35e818dd44390ef0d05a312a9cb3c0b6199cafc8
author Jaewan Kim <jaewan@google.com> Wed Oct 18 05:36:38 2023 +0000
committer Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Wed Oct 18 05:36:38 2023 +0000
tree 46ae482dcbfe353a6ed358697a375fd2d5f04904
parent e031edca53c655077ffcb6792b08d883551fa38a

Renaming dtbo_node to dtbo_label

crosvm expects dtbo_label to find nodes's full path from __symbols__,
so we'd better to match naming.

Bug: 304643002
Test: TH
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2804273713d743f0b0b6986318f72c8a1f86ee20)
Merged-In: Iee3792f1203278d6dd261750d0dc318662783a11
Change-Id: Iee3792f1203278d6dd261750d0dc318662783a11

virtualizationservice/src/aidl.rs

diff --git a/virtualizationservice/src/aidl.rs b/virtualizationservice/src/aidl.rs
index ed5c513..a19ecd2 100644
--- a/virtualizationservice/src/aidl.rs
+++ b/virtualizationservice/src/aidl.rs
@@ -209,7 +209,7 @@
             .into_iter()
             .filter_map(|x| {
                 if devices.contains(&x.sysfs_path) {
-                    Some(BoundDevice { sysfsPath: x.sysfs_path, dtboNode: x.dtbo_node })
+                    Some(BoundDevice { sysfsPath: x.sysfs_path, dtboLabel: x.dtbo_label })
                 } else {
                     None
                 }
@@ -222,7 +222,7 @@
 #[derive(Debug, Deserialize)]
 struct Device {
     kind: String,
-    dtbo_node: String,
+    dtbo_label: String,
     sysfs_path: String,
 }