Merge branch 'allow_qemu_serial_logfile' into 'master'

Allow logging serial from qemu to a file.

See merge request redox-os/redox!1247
This commit is contained in:
Jeremy Soller 2020-07-24 12:41:47 +00:00
commit 48e076a631

View file

@ -5,7 +5,8 @@ QEMU_EFI=/usr/share/OVMF/OVMF_CODE.fd
ifeq ($(serial),no) ifeq ($(serial),no)
QEMUFLAGS+=-chardev stdio,id=debug -device isa-debugcon,iobase=0x402,chardev=debug QEMUFLAGS+=-chardev stdio,id=debug -device isa-debugcon,iobase=0x402,chardev=debug
else else
QEMUFLAGS+=-serial mon:stdio QEMUFLAGS+=-chardev stdio,id=debug,signal=off,mux=on,"$(if $(qemu_serial_logfile),logfile=$(qemu_serial_logfile))"
QEMUFLAGS+=-serial chardev:debug -mon chardev=debug
endif endif
ifeq ($(iommu),yes) ifeq ($(iommu),yes)
QEMUFLAGS+=-machine q35,iommu=on QEMUFLAGS+=-machine q35,iommu=on