commit eedbc06088db7d9c215d73d6fb425b325b8a91ba
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 04 19:13:43 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 04 19:13:43 2022 +0000
tree baa17b4f728780ed318ab04a39b73e9ac9e97d04
parent f72aa0fbccab49734ed916974a41bd616d4e0222
parent 86c76fa8a53802252660c53567e8c88257028b21

Merge changes Ie07aa647,Ibdc355b1

* changes:
  Revert "Temporary hack: Boot protected VMs without pVM firmware."
  Update pvmfw.img

.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb

diff --git a/.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb b/.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb
index 4199b2b..a8abf97 100644
--- a/.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb
+++ b/.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "8134799"
+    build_id: "8149267"
     target: "u-boot_pvmfw"
     source_file: "pvmfw.img"
   }

pvmfw/pvmfw.img

diff --git a/pvmfw/pvmfw.img b/pvmfw/pvmfw.img
index a2541a3..c036c76 100644
--- a/pvmfw/pvmfw.img
+++ b/pvmfw/pvmfw.img
Binary files differ

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 {