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:?}");
}
diff --git a/virtualizationservice/aidl/android/system/virtualizationservice_internal/IVirtualizationServiceInternal.aidl b/virtualizationservice/aidl/android/system/virtualizationservice_internal/IVirtualizationServiceInternal.aidl
index f3a7617..172dc59 100644
--- a/virtualizationservice/aidl/android/system/virtualizationservice_internal/IVirtualizationServiceInternal.aidl
+++ b/virtualizationservice/aidl/android/system/virtualizationservice_internal/IVirtualizationServiceInternal.aidl
@@ -25,7 +25,7 @@
interface IVirtualizationServiceInternal {
parcelable BoundDevice {
String sysfsPath;
- String dtboNode;
+ String dtboLabel;
}
/**
* Removes the memlock rlimit of the calling process.
diff --git a/virtualizationservice/assignable_devices.xsd b/virtualizationservice/assignable_devices.xsd
index 8f43019..2fbc1c9 100644
--- a/virtualizationservice/assignable_devices.xsd
+++ b/virtualizationservice/assignable_devices.xsd
@@ -25,7 +25,7 @@
</xs:element>
<xs:complexType name="device">
<xs:attribute name="kind" type="xs:string"/>
- <xs:attribute name="dtbo_node" type="xs:string"/>
+ <xs:attribute name="dtbo_label" type="xs:string"/>
<xs:attribute name="sysfs_path" type="xs:string"/>
</xs:complexType>
</xs:schema>
diff --git a/virtualizationservice/schema/current.txt b/virtualizationservice/schema/current.txt
index ef99294..6e3fbb6 100644
--- a/virtualizationservice/schema/current.txt
+++ b/virtualizationservice/schema/current.txt
@@ -3,10 +3,10 @@
public class Device {
ctor public Device();
- method public String getDtbo_node();
+ method public String getDtbo_label();
method public String getKind();
method public String getSysfs_path();
- method public void setDtbo_node(String);
+ method public void setDtbo_label(String);
method public void setKind(String);
method public void setSysfs_path(String);
}
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,
}