pa-fazil
/
android_packages_modules_Virtualization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes Ie07aa647,Ibdc355b1 

* changes:
  Revert "Temporary hack: Boot protected VMs without pVM firmware."
  Update pvmfw.img
This commit is contained in:
Treehugger Robot 2022-02-04 19:13:43 +00:00 committed by Gerrit Code Review
parent f72aa0fbcc 86c76fa8a5
commit eedbc06088
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb
View File

@ -1,6 +1,6 @@
drops { drops {
android_build_drop { android_build_drop {
build_id: "8134799" build_id: "8149267"
target: "u-boot_pvmfw" target: "u-boot_pvmfw"
source_file: "pvmfw.img" source_file: "pvmfw.img"
} }

BIN
pvmfw/pvmfw.img
View File

Binary file not shown.

3
virtualizationservice/src/crosvm.rs
View File

@ -271,8 +271,7 @@ fn run_vm(config: CrosvmConfig) -> Result<SharedChild, Error> {
.arg(config.cid.to_string()); .arg(config.cid.to_string());
if config.protected { if config.protected {
// TODO: Go back to "--protected-vm" once pVM firmware is fixed. command.arg("--protected-vm");
command.arg("--protected-vm-without-firmware");
} }
if let Some(memory_mib) = config.memory_mib { if let Some(memory_mib) = config.memory_mib {