| commit | c12dae24ce161b1002bff70a3c00f2d0784ba23a | [log] [tgz] |
|---|---|---|
| author | Nikita Ioffe <ioffe@google.com> | Wed Nov 27 16:28:57 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 27 16:28:57 2024 +0000 |
| tree | ca481140feb9de88d634c697b9ed26946601c33e | |
| parent | 397083b7ce41537cf65877c6de7757b15b6060cb [diff] | |
| parent | 89d501cef02e1c69e4cd59f0d75d909725d3c893 [diff] |
Merge "vm --enable-earlycon arg: also enable keep_bootcon" into main am: 1ac75a2681 am: 89d501cef0 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3380275 Change-Id: I6e6f791bbbad6c0f71d09bdb911e65bc3c2154d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/android/vm/src/run.rs b/android/vm/src/run.rs index 2157ea8..0037327 100644 --- a/android/vm/src/run.rs +++ b/android/vm/src/run.rs
@@ -173,6 +173,7 @@ } else { bail!("unexpected architecture!"); } + custom_config.extraKernelCmdlineParams.push(String::from("keep_bootcon")); } let vm_config = VirtualMachineConfig::AppConfig(VirtualMachineAppConfig {