aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver O'Halloran <oohall@gmail.com>2020-06-12 12:24:38 +1000
committerOliver O'Halloran <oohall@gmail.com>2020-06-17 21:18:45 +1000
commit21fd8a33bd514cad54f54ef0fcf89f9d88b4f9cd (patch)
tree680f5584d94ba2df4553bd0d785bfd3ba01474a7
parent1e0ac5f5ef0fda36e62d545831138023fe02b588 (diff)
downloadskiboot-21fd8a33bd514cad54f54ef0fcf89f9d88b4f9cd.zip
skiboot-21fd8a33bd514cad54f54ef0fcf89f9d88b4f9cd.tar.gz
skiboot-21fd8a33bd514cad54f54ef0fcf89f9d88b4f9cd.tar.bz2
test/qemu: Update command line arguments
Modern qemu builds will barf if you specify the BMC / ipmi device on the command line without -nodefaults. So add that in and put in an explicit serial device. Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
-rwxr-xr-xtest/hello_world/run_qemu_hello_world.sh3
-rwxr-xr-xtest/run_qemu_boot_test.sh3
2 files changed, 4 insertions, 2 deletions
diff --git a/test/hello_world/run_qemu_hello_world.sh b/test/hello_world/run_qemu_hello_world.sh
index 265add8..36f7c76 100755
--- a/test/hello_world/run_qemu_hello_world.sh
+++ b/test/hello_world/run_qemu_hello_world.sh
@@ -1,6 +1,7 @@
#!/bin/bash
-QEMU_ARGS="-M powernv -nographic -device ipmi-bmc-sim,id=bmc0 -device isa-ipmi-bt,bmc=bmc0,irq=10"
+QEMU_ARGS="-M powernv -nodefaults -device ipmi-bmc-sim,id=bmc0 -serial none"
+QEMU_ARGS+=" -device isa-serial,chardev=s1 -chardev stdio,id=s1,signal=off"
if [ -z "$QEMU_BIN" ]; then
QEMU_BIN="qemu-system-ppc64"
diff --git a/test/run_qemu_boot_test.sh b/test/run_qemu_boot_test.sh
index ee3d9da..ad28b33 100755
--- a/test/run_qemu_boot_test.sh
+++ b/test/run_qemu_boot_test.sh
@@ -1,6 +1,7 @@
#!/bin/bash
-QEMU_ARGS="-M powernv -m 3G -nographic -device ipmi-bmc-sim,id=bmc0 -device isa-ipmi-bt,bmc=bmc0,irq=10"
+QEMU_ARGS="-M powernv -nodefaults -device ipmi-bmc-sim,id=bmc0 -serial none"
+QEMU_ARGS+=" -device isa-serial,chardev=s1 -chardev stdio,id=s1,signal=off"
if [ -z "$QEMU_BIN" ]; then
QEMU_BIN="qemu-system-ppc64"