Refactor to handle log output outside of pvmfw
This unifies the components to handle debug policies,
and also make pvmfw to depend less on the host's input.
This also limits the number of components to handle debug policy
to make further debug policy changes easier.
Bug: 272496125
Test: atest MicrodroidTestApp MicrodroidHostTestCases
Change-Id: I4404240c1b9ce381be93b0d935c4d29643a06973
diff --git a/virtualizationmanager/src/crosvm.rs b/virtualizationmanager/src/crosvm.rs
index 7201670..8497564 100644
--- a/virtualizationmanager/src/crosvm.rs
+++ b/virtualizationmanager/src/crosvm.rs
@@ -732,18 +732,13 @@
let ramdump_reserve = RAMDUMP_RESERVED_MIB + swiotlb_size_mib;
command.arg("--params").arg(format!("crashkernel={ramdump_reserve}M"));
}
- } else {
- if config.ramdump.is_some() {
- command.arg("--params").arg(format!("crashkernel={RAMDUMP_RESERVED_MIB}M"));
- }
- if config.debug_level == DebugLevel::NONE
- && should_prepare_console_output(config.debug_level)
- {
- // bootconfig.normal will be used, but we need log.
- // pvmfw will add following commands by itself, but non-protected VM should do so here.
- command.arg("--params").arg("printk.devkmsg=on");
- command.arg("--params").arg("console=hvc0");
- }
+ } else if config.ramdump.is_some() {
+ command.arg("--params").arg(format!("crashkernel={RAMDUMP_RESERVED_MIB}M"));
+ }
+ if config.debug_level == DebugLevel::NONE && should_prepare_console_output(config.debug_level) {
+ // bootconfig.normal will be used, but we need log.
+ command.arg("--params").arg("printk.devkmsg=on");
+ command.arg("--params").arg("console=hvc0");
}
if let Some(memory_mib) = config.memory_mib {