commit 4dd3818f25efc82943a83aa3abc1018c614b0ad2
author Seungjae Yoo <seungjaeyoo@google.com> Thu Nov 09 15:05:45 2023 +0900
committer Seungjae Yoo <seungjaeyoo@google.com> Wed Dec 20 01:26:58 2023 +0000
tree 66654ce0c504a6984e00fbd48febfae5885aa8de
parent bd2b67b4ffef904e1934f21ff62b3a1ff14d8e93

Append dtbo_vendor into --device-tree-overlay crosvm option

This change would make non-protected VM pass vendor public key into
microdroid. It should be merged after crosvm in AOSP support
--device-tree-overlay option.

Bug: 285855436
Test: atest MicrodroidTests#bootsWithVendorPartition
Change-Id: I73760a89447761f1ca603000ab47273ab85ff5ee

virtualizationmanager/src/crosvm.rs

diff --git a/virtualizationmanager/src/crosvm.rs b/virtualizationmanager/src/crosvm.rs
index b842574..8d3abed 100644
--- a/virtualizationmanager/src/crosvm.rs
+++ b/virtualizationmanager/src/crosvm.rs
@@ -887,7 +887,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, &config)?;