console: add optional registration for QEMU console

Signed-off-by: Pawel Wieczorkiewicz <[email protected]>
KernelTestFramework · Jan 25, 2022 · 3763d6f · 3763d6f
1 parent 4f65211
commit 3763d6f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/common/cmdline.c b/common/cmdline.c
@@ -46,6 +46,9 @@ bool_cmd("hpet", opt_hpet);
 bool opt_fpu = false;
 bool_cmd("fpu", opt_fpu);
 
+bool opt_qemu_console = false;
+bool_cmd("qemu_console", opt_qemu_console);
+
 const char *kernel_cmdline;
 
 void __text_init cmdline_parse(const char *cmdline) {

diff --git a/common/console.c b/common/console.c
@@ -35,8 +35,6 @@
 
 #include <smp/smp.h>
 
-#define QEMU_CONSOLE   0x0e9
-
 #define VPRINTK_BUF_SIZE 1024
 
 static console_callback_entry_t console_callbacks[2];

diff --git a/common/setup.c b/common/setup.c
@@ -69,13 +69,19 @@ static unsigned bsp_cpu_id = 0;
 unsigned get_bsp_cpu_id(void) { return bsp_cpu_id; }
 void set_bsp_cpu_id(unsigned cpu_id) { bsp_cpu_id = cpu_id; }
 
+#define QEMU_CONSOLE_PORT 0x0e9
 static void __text_init init_console(void) {
     get_com_ports();
 
     uart_init(com_ports[0], DEFAULT_BAUD_SPEED);
     register_console_callback(serial_console_write, _ptr(com_ports[0]));
 
     printk("COM1: %x, COM2: %x\n", com_ports[0], com_ports[1]);
+
+    if (opt_qemu_console) {
+        register_console_callback(qemu_console_write, _ptr(QEMU_CONSOLE_PORT));
+        printk("Initialized QEMU console at port 0x%x", QEMU_CONSOLE_PORT);
+    }
 }
 
 static __always_inline void zero_bss(void) {

diff --git a/include/cmdline.h b/include/cmdline.h
@@ -63,6 +63,7 @@ extern bool opt_pit;
 extern bool opt_apic_timer;
 extern bool opt_hpet;
 extern bool opt_fpu;
+extern bool opt_qemu_console;
 extern const char *kernel_cmdline;
 
 extern void cmdline_parse(const char *cmdline);