| Message ID | 20200612022452.371685-2-oohall@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [01/15] test/qemu: Update command line arguments | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch master (fe70fbb78d33abea788a3221bc409a7c50c019c3) |
| snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot | success | Test snowpatch/job/snowpatch-skiboot on branch master |
| snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot-dco | success | Signed-off-by present |
diff --git a/test/hello_world/run_qemu_hello_world.sh b/test/hello_world/run_qemu_hello_world.sh index 265add84728e..36f7c762b988 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 ee3d9da93148..ad28b336f7b9 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"
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> --- test/hello_world/run_qemu_hello_world.sh | 3 ++- test/run_qemu_boot_test.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)