From 449dd6b709af8362a43b566168263b909428347c Mon Sep 17 00:00:00 2001 From: Paramjit Oberoi Date: Fri, 25 Feb 2022 12:25:17 -0800 Subject: [PATCH] Don't add ramoops parameters except addr and size BUG=b:218891911 TEST=manual testing Cq-Depend: chromium:3491214 Change-Id: If2b7e4856ac497f2c3b277ed02bd96c9e629aa2e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3491603 Tested-by: kokoro Reviewed-by: Daniel Verkamp Commit-Queue: Paramjit Oberoi --- arch/src/pstore.rs | 3 --- src/main.rs | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/src/pstore.rs b/arch/src/pstore.rs index bf90974db9..a91480134e 100644 --- a/arch/src/pstore.rs +++ b/arch/src/pstore.rs @@ -84,9 +84,6 @@ pub fn add_ramoops_kernel_cmdline( let ramoops_opts = [ ("mem_address", ramoops_region.address), ("mem_size", ramoops_region.size as u64), - ("console_size", (ramoops_region.size / 4) as u64), - ("record_size", (ramoops_region.size / 4) as u64), - ("dump_oops", 1_u64), ]; for (name, val) in &ramoops_opts { cmdline.insert_str(format!("ramoops.{}={:#x}", name, val))?; diff --git a/src/main.rs b/src/main.rs index 30a7bba3f8..cdaf233e65 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2583,7 +2583,7 @@ fn run_vm(args: std::env::Args) -> std::result::Result { See --disk for valid options."), Argument::value("rw-pmem-device", "PATH", "Path to a writable disk image."), Argument::value("pmem-device", "PATH", "Path to a disk image."), - Argument::value("pstore", "path=PATH,size=SIZE", "Path to pstore buffer backend file follewed by size."), + Argument::value("pstore", "path=PATH,size=SIZE", "Path to pstore buffer backend file followed by size."), Argument::value("host_ip", "IP", "IP address to assign to host tap interface."),