From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 30 Jul 2018 11:37:22 +0000 (+0100)
Subject: tests: Disable sercon in SeaBIOS
X-Git-Tag: grub-2.04-rc1~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7090b77341fbb0fd45c72a77e8508a25bf35835d;p=thirdparty%2Fgrub.git

tests: Disable sercon in SeaBIOS

SeaBIOS 1.11.0 added support for VGA emulation over a serial port, which
interferes with grub-shell.  Turn it off.

Signed-off-by: Colin Watson <cjwatson@ubuntu.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index d690d6734..93e9f5148 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -369,6 +369,13 @@ test -z "$debug" || echo "GRUB ROM directory: ${rom_directory}" >&2
 
 if test -z "$debug"; then
   qemuopts="${qemuopts} -nographic -monitor file:/dev/null"
+  # SeaBIOS 1.11.0 added support for VGA emulation over a serial port.  If
+  # this is configured in SeaBIOS, then -nographic causes some extra junk to
+  # end up on the serial console, which interferes with our tests.  This
+  # workaround unfortunately causes qemu to issue a warning 'externally
+  # provided fw_cfg item names should be prefixed with "opt/"', but there
+  # doesn't seem to be a better option.
+  qemuopts="${qemuopts} -fw_cfg name=etc/sercon-port,string=0"
 fi
 
 if [ x$boot != xnet ] && [ x$boot != xemu ]; then