| commit | 89d501cef02e1c69e4cd59f0d75d909725d3c893 | [log] [tgz] |
|---|---|---|
| author | Nikita Ioffe <ioffe@google.com> | Wed Nov 27 16:06:55 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 27 16:06:55 2024 +0000 |
| tree | a3be955c11694fd7ab736ad660f3a3b57749ed18 | |
| parent | 807653c947df8858ebeaa18477b0b936a2476032 [diff] | |
| parent | 1ac75a2681660b1cb96080f7fdb03ea1d1f17dcf [diff] |
Merge "vm --enable-earlycon arg: also enable keep_bootcon" into main am: 1ac75a2681 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3380275 Change-Id: I4e4d83814a53690e97f30b72f2651fe4dea51d19 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 {