Merge pull request #7887 from jodh-intel/hypervisor-remove-debug-kernel-options

runtime-rs: hypervisor: Remove debug kernel options

src/runtime-rs/Makefile

@@ -122,7 +122,7 @@ DEFMEMSZ := 2048
 DEFMEMSLOTS := 10
 ##VAR DEFBRIDGES=<number> Default number of bridges
 DEFBRIDGES := 0
-DEFENABLEANNOTATIONS := []
+DEFENABLEANNOTATIONS := [\"kernel_params\"]
 DEFDISABLEGUESTSECCOMP := true
 DEFDISABLEGUESTEMPTYDIR := false
 ##VAR DEFAULTEXPFEATURES=[features] Default experimental features enabled

src/runtime-rs/crates/hypervisor/src/kernel_param.rs

@@ -56,8 +56,6 @@ impl KernelParams {
         // default kernel params
         let mut params = vec![
             Param::new("reboot", "k"),
-            Param::new("earlyprintk", "ttyS0"),
-            Param::new("initcall_debug", ""),
             Param::new("panic", "1"),
             Param::new("systemd.unit", "kata-containers.target"),
             Param::new("systemd.mask", "systemd-networkd.service"),

src/runtime/Makefile

@@ -194,7 +194,7 @@ DEFMEMSLOTS := 10
 DEFMAXMEMSZ := 0
 #Default number of bridges
 DEFBRIDGES := 1
-DEFENABLEANNOTATIONS := [\"enable_iommu\", \"virtio_fs_extra_args\"]
+DEFENABLEANNOTATIONS := [\"enable_iommu\", \"virtio_fs_extra_args\", \"kernel_params\"]
 DEFDISABLEGUESTSECCOMP := true
 DEFDISABLEGUESTEMPTYDIR := false
 #Default experimental features enabled

utils/kata-manager.sh

@@ -593,7 +593,7 @@ configure_kata()
 
 	sudo sed -i \
 		-e 's/^# *\(enable_debug\).*=.*$/\1 = true/g' \
-		-e 's/^kernel_params = "\(.*\)"/kernel_params = "\1 agent.log=debug initcall_debug"/g' \
+		-e 's/^kernel_params = "\(.*\)"/kernel_params = "\1 agent.log=debug"/g' \
 		"$cfg_to"
 
 	info "Configured $kata_project for full debug (delete $cfg_to to use pristine $kata_project configuration)"