From 0f545ed1a9fffdeee3e73e9aef7f4c0620f78674 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Mon, 11 Mar 2019 19:55:10 -0600
Subject: [PATCH] Use serial for debugging by default

---
 kernel     | 2 +-
 mk/qemu.mk | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/kernel b/kernel
index b80f38b..a0e9f4a 160000
--- a/kernel
+++ b/kernel
@@ -1 +1 @@
-Subproject commit b80f38b03950a65821edc2560dc2f32222522bfd
+Subproject commit a0e9f4a8a0f3b00f5b1f54d1960c105ea5a0f73e
diff --git a/mk/qemu.mk b/mk/qemu.mk
index 16d2aaf..ce05336 100644
--- a/mk/qemu.mk
+++ b/mk/qemu.mk
@@ -1,7 +1,11 @@
 QEMU=SDL_VIDEO_X11_DGAMOUSE=0 qemu-system-$(ARCH)
 QEMUFLAGS=-d cpu_reset -d guest_errors
 QEMUFLAGS+=-smp 4 -m 2048
-QEMUFLAGS+=-chardev stdio,id=debug -device isa-debugcon,iobase=0x402,chardev=debug
+ifeq ($(serial),no)
+	QEMUFLAGS+=-chardev stdio,id=debug -device isa-debugcon,iobase=0x402,chardev=debug
+else
+	QEMUFLAGS+=-serial mon:stdio
+endif
 ifeq ($(iommu),yes)
 	QEMUFLAGS+=-machine q35,iommu=on
 else