grub-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 02/19] grub-shell: pseries: don't pass fw_opt to qemu


From: Daniel Axtens
Subject: [PATCH 02/19] grub-shell: pseries: don't pass fw_opt to qemu
Date: Tue, 12 Oct 2021 18:29:51 +1100

At some point this started to break the test - qemu just rejects the
command line. Just don't pass it in, it's seabios specific.

Signed-off-by: Daniel Axtens <dja@axtens.net>
---
 tests/util/grub-shell.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 33590baeb13c..92c0b6f320c3 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -376,7 +376,11 @@ if test -z "$debug"; then
   # 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"
+  #
+  # Don't do this on pseries, it breaks recent qemus.
+  if [ $pseries == n ]; then
+    qemuopts="${qemuopts} -fw_cfg name=etc/sercon-port,string=0"
+  fi
 fi
 
 if [ x$boot != xnet ] && [ x$boot != xemu ]; then
-- 
2.30.2




reply via email to

[Prev in Thread] Current Thread [Next in Thread]