Add a feature named enable-console-log

This feature can be used to enable printing log messages to console in addition to storing them in the log buffer. Use ENABLE_CONSOLE_LOG=1 to enable this feature. By default, this feature is disabled for release builds and enabled for debug builds. Signed-off-by: Vasant Karasulli <[email protected]>
coconut-svsm · Oct 18, 2024 · 6536aee · 6536aee
1 parent 05bc4de
commit 6536aee
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -7,8 +7,16 @@ SVSM_ARGS_TEST += --no-default-features --features ${FEATURES_TEST}
 ifdef RELEASE
 TARGET_PATH=release
 CARGO_ARGS += --release
+ENABLE_CONSOLE_LOG ?= 0
 else
 TARGET_PATH=debug
+ENABLE_CONSOLE_LOG ?= 1
+endif
+
+STAGE2_ARGS =
+ifeq ($(ENABLE_CONSOLE_LOG), 1)
+SVSM_ARGS += --features enable-console-log
+STAGE2_ARGS += --features enable-console-log
 endif
 
 ifdef OFFLINE
@@ -124,7 +132,7 @@ bin/meta.bin: utils/gen_meta utils/print-meta bin
 	./utils/gen_meta $@
 
 bin/stage2.bin: bin
-	cargo build --manifest-path kernel/Cargo.toml ${CARGO_ARGS} --bin stage2
+	cargo build --manifest-path kernel/Cargo.toml ${CARGO_ARGS} ${STAGE2_ARGS} --bin stage2
 	objcopy -O binary ${STAGE2_ELF} $@
 
 bin/svsm-kernel.elf: bin

diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
@@ -43,6 +43,7 @@ test.workspace = true
 default = []
 enable-gdb = ["dep:gdbstub", "dep:gdbstub_arch"]
 mstpm = ["dep:libmstpm"]
+enable-console-log = []
 
 [dev-dependencies]
 

diff --git a/kernel/src/cpu/line_buffer.rs b/kernel/src/cpu/line_buffer.rs
@@ -78,18 +78,30 @@ impl log::Log for BufferLogger {
                 line_buf
                     .write_fmt(format_args!("[{}] {}: {}\n", comp, lvl, rec_args))
                     .unwrap();
+                #[cfg(feature = "enable-console-log")]
+                {
+                    _print(format_args!("[{}] {}: {}\n", comp, lvl, rec_args));
+                }
             }
 
             log::Level::Info => {
                 line_buf
                     .write_fmt(format_args!("[{}] {}\n", comp, rec_args))
                     .unwrap();
+                #[cfg(feature = "enable-console-log")]
+                {
+                    _print(format_args!("[{}] {}\n", comp, rec_args));
+                }
             }
 
             log::Level::Debug | log::Level::Trace => {
                 line_buf
                     .write_fmt(format_args!("[{}/{}] {} {}\n", comp, target, lvl, rec_args))
                     .unwrap();
+                #[cfg(feature = "enable-console-log")]
+                {
+                    _print(format_args!("[{}/{}] {} {}\n", comp, target, lvl, rec_args));
+                }
             }
         }
     }