commit 86c76fa8a53802252660c53567e8c88257028b21
author David Brazdil <dbrazdil@google.com> Fri Feb 04 15:50:57 2022 +0000
committer David Brazdil <dbrazdil@google.com> Fri Feb 04 15:52:34 2022 +0000
tree dbe6df6c67eeb29c4ed86ff497cf4904be7038bb
parent b14af875332069d4ad0a3c03dc94b633cdd82a51

Revert "Temporary hack: Boot protected VMs without pVM firmware."

This reverts commit b6547b4c066c6bdfb881f247d6b104e057da9c1b.

Reason for revert: Not needed anymore

Bug: 217687661
Test: run CompOS in protected mode
Change-Id: Ie07aa64785cdd9970d1677f8f531ad89d11f2c5c

virtualizationservice/src/crosvm.rs

diff --git a/virtualizationservice/src/crosvm.rs b/virtualizationservice/src/crosvm.rs
index 352ed50..2c50fed 100644
--- a/virtualizationservice/src/crosvm.rs
+++ b/virtualizationservice/src/crosvm.rs
@@ -271,8 +271,7 @@
         .arg(config.cid.to_string());
 
     if config.protected {
-        // TODO: Go back to "--protected-vm" once pVM firmware is fixed.
-        command.arg("--protected-vm-without-firmware");
+        command.arg("--protected-vm");
     }
 
     if let Some(memory_mib) = config.memory_mib {