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
diff --git a/virtualizationmanager/src/aidl.rs b/virtualizationmanager/src/aidl.rs
index 684aa64..5283ffe 100644
--- a/virtualizationmanager/src/aidl.rs
+++ b/virtualizationmanager/src/aidl.rs
@@ -474,7 +474,7 @@
.into_iter()
.map(|x| VfioDevice {
sysfs_path: PathBuf::from(&x.sysfsPath),
- dtbo_node: x.dtboNode,
+ dtbo_label: x.dtboLabel,
})
.collect::<Vec<_>>()
} else {
diff --git a/virtualizationmanager/src/crosvm.rs b/virtualizationmanager/src/crosvm.rs
index b053d99..bb6066f 100644
--- a/virtualizationmanager/src/crosvm.rs
+++ b/virtualizationmanager/src/crosvm.rs
@@ -128,7 +128,7 @@
#[derive(Clone, Debug)]
pub struct VfioDevice {
pub sysfs_path: PathBuf,
- pub dtbo_node: String,
+ pub dtbo_label: String,
}
/// The lifecycle state which the payload in the VM has reported itself to be in.
@@ -716,7 +716,7 @@
}
if let Some(p) = path.to_str() {
- Ok(format!("--vfio={p},iommu=viommu,dt-symbol={0}", device.dtbo_node))
+ Ok(format!("--vfio={p},iommu=viommu,dt-symbol={0}", device.dtbo_label))
} else {
bail!("invalid path {path:?}");
}