diff mbox series

[v2,8/9] test: Update qemu arguments to use bmc simulator

Message ID 20181212050258.10103-9-joel@jms.id.au
State Accepted
Headers show
Series CI Updates | expand

Checks

Context Check Description
snowpatch_ozlabs/apply_patch success master/apply_patch Successfully applied
snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot success Test snowpatch/job/snowpatch-skiboot on branch master

Commit Message

Joel Stanley Dec. 12, 2018, 5:02 a.m. UTC 
THe qemu skiboot platform as of 8340a9642bba ("plat/qemu: use the common
OpenPOWER routines to initialize") uses the common aspeed BMC setup
routines. This means a BT interface is always set up, and if the
corresponding Qemu model is not present the timeout is 30 seconds.

It looks like this every time an IPMI message is sent:

 BT: seq 0x9e netfn 0x06 cmd 0x31: Maximum queue length exceeded
 BT: seq 0x9d netfn 0x06 cmd 0x31: Removed from queue
 BT: seq 0x9f netfn 0x06 cmd 0x31: Maximum queue length exceeded
 BT: seq 0x9e netfn 0x06 cmd 0x31: Removed from queue
 BT: seq 0xa0 netfn 0x06 cmd 0x31: Maximum queue length exceeded
 BT: seq 0x9f netfn 0x06 cmd 0x31: Removed from queue

Avoid this by adding the bmc simulator model to the Qemu powernv
machine.

Signed-off-by: Joel Stanley <joel@jms.id.au>
---
 test/hello_world/run_qemu_hello_world.sh           | 3 ++-
 test/run_qemu-jessie-debian-installer_boot_test.sh | 3 ++-
 test/run_qemu_boot_test.sh                         | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/test/hello_world/run_qemu_hello_world.sh b/test/hello_world/run_qemu_hello_world.sh
index e8d317607392..e105910d22bc 100755
--- a/test/hello_world/run_qemu_hello_world.sh
+++ b/test/hello_world/run_qemu_hello_world.sh
@@ -1,5 +1,6 @@ 
 #!/bin/bash
 
+QEMU_ARGS="-M powernv -nographic -device ipmi-bmc-sim,id=bmc0 -device isa-ipmi-bt,bmc=bmc0,irq=10"
 
 if [ -z "$QEMU_BIN" ]; then
     QEMU_BIN="qemu-system-ppc64"
@@ -30,7 +31,7 @@  trap "rm -f -- '$t'" EXIT
 (
 cat <<EOF | expect
 set timeout 30
-spawn $QEMU_BIN -m 1G -M powernv -kernel $SKIBOOT_ZIMAGE -nographic
+spawn $QEMU_BIN $QEMU_ARGS -kernel $SKIBOOT_ZIMAGE -nographic
 expect {
 timeout { send_user "\nTimeout waiting for hello world\n"; exit 1 }
 eof { send_user "\nUnexpected EOF\n;" exit 1 }
diff --git a/test/run_qemu-jessie-debian-installer_boot_test.sh b/test/run_qemu-jessie-debian-installer_boot_test.sh
index 652ca3811aed..eb9c1a8625ac 100755
--- a/test/run_qemu-jessie-debian-installer_boot_test.sh
+++ b/test/run_qemu-jessie-debian-installer_boot_test.sh
@@ -1,5 +1,6 @@ 
 #!/bin/bash
 
+QEMU_ARGS="-m 2G -M powernv -nographic -device ipmi-bmc-sim,id=ipmi0 -device isa-ipmi-bt,bmc=ipmi0"
 
 if [ -z "$QEMU_BIN" ]; then
     QEMU_BIN="qemu-system-ppc64"
@@ -39,7 +40,7 @@  T=$(mktemp  --tmpdir skiboot_qemu_debian-jessie-boot_test.XXXXXXXXXX)
 
 ( cat <<EOF | expect
 set timeout 600
-spawn $QEMU_BIN -m 2G -M powernv -kernel debian-jessie-vmlinux -initrd debian-jessie-initrd.gz -nographic -device ipmi-bmc-sim,id=ipmi0 -device isa-ipmi-bt,bmc=ipmi0
+spawn $QEMU_BIN $QEMU_ARGS -kernel debian-jessie-vmlinux -initrd debian-jessie-initrd.gz
 expect {
 timeout { send_user "\nTimeout waiting for petitboot\n"; exit 1 }
 eof { send_user "\nUnexpected EOF\n;" exit 1 }
diff --git a/test/run_qemu_boot_test.sh b/test/run_qemu_boot_test.sh
index 08bb65aa6199..9c5f4e52abb3 100755
--- a/test/run_qemu_boot_test.sh
+++ b/test/run_qemu_boot_test.sh
@@ -1,5 +1,6 @@ 
 #!/bin/bash
 
+QEMU_ARGS="-M powernv -m 3G -nographic -device ipmi-bmc-sim,id=bmc0 -device isa-ipmi-bt,bmc=bmc0,irq=10"
 
 if [ -z "$QEMU_BIN" ]; then
     QEMU_BIN="qemu-system-ppc64"
@@ -33,7 +34,7 @@  T=$(mktemp  --tmpdir skiboot_qemu_boot_test.XXXXXXXXXX)
 
 ( cat <<EOF | expect
 set timeout 600
-spawn $QEMU_BIN -m 3G -M powernv -kernel $SKIBOOT_ZIMAGE -nographic -device ipmi-bmc-sim,id=ipmi0 -device isa-ipmi-bt,bmc=ipmi0
+spawn $QEMU_BIN $QEMU_ARGS -kernel $SKIBOOT_ZIMAGE
 expect {
 timeout { send_user "\nTimeout waiting for petitboot\n"; exit 1 }
 eof { send_user "\nUnexpected EOF\n;" exit 1 }