Merge "Append dtbo_vendor into --device-tree-overlay crosvm option" into main
diff --git a/virtualizationmanager/src/crosvm.rs b/virtualizationmanager/src/crosvm.rs
index 2ba0e0e..f0c3e4b 100644
--- a/virtualizationmanager/src/crosvm.rs
+++ b/virtualizationmanager/src/crosvm.rs
@@ -900,7 +900,9 @@
.arg("--socket")
.arg(add_preserved_fd(&mut preserved_fds, &control_server_socket.as_raw_descriptor()));
- // TODO(b/285855436): Pass dtbo_vendor after --device-tree-overlay crosvm option is supported.
+ if let Some(dtbo_vendor) = &config.dtbo_vendor {
+ command.arg("--device-tree-overlay").arg(add_preserved_fd(&mut preserved_fds, dtbo_vendor));
+ }
append_platform_devices(&mut command, &mut preserved_fds, &config)?;