Add more strict device assignment test
Bug: 326539895
Test: atest MicrodroidHostTestCases
Change-Id: Icf7deafaaad586131026c8de864ec97539d37996
diff --git a/virtualizationservice/aidl/android/system/virtualizationservice/AssignableDevice.aidl b/virtualizationservice/aidl/android/system/virtualizationservice/AssignableDevice.aidl
index 014d78c..20114d7 100644
--- a/virtualizationservice/aidl/android/system/virtualizationservice/AssignableDevice.aidl
+++ b/virtualizationservice/aidl/android/system/virtualizationservice/AssignableDevice.aidl
@@ -21,6 +21,6 @@
/** Path to SysFS node of the device. */
String node;
- /** Kind of the device. */
- String kind;
+ /** DTBO label. */
+ String dtbo_label;
}
diff --git a/virtualizationservice/src/aidl.rs b/virtualizationservice/src/aidl.rs
index 05f3cf6..1fb7052 100644
--- a/virtualizationservice/src/aidl.rs
+++ b/virtualizationservice/src/aidl.rs
@@ -372,7 +372,7 @@
Ok(get_assignable_devices()?
.device
.into_iter()
- .map(|x| AssignableDevice { node: x.sysfs_path, kind: x.kind })
+ .map(|x| AssignableDevice { node: x.sysfs_path, dtbo_label: x.dtbo_label })
.collect::<Vec<_>>())
}
@@ -476,10 +476,8 @@
}
}
-// KEEP IN SYNC WITH assignable_devices.xsd
#[derive(Debug, Deserialize)]
struct Device {
- kind: String,
dtbo_label: String,
sysfs_path: String,
}