aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Barrat <fbarrat@linux.ibm.com>2023-01-05 18:56:49 +0100
committerReza Arbab <arbab@linux.ibm.com>2023-01-19 09:47:16 -0600
commit16aac05742dee3c80983145a6af6b2fc8a840ae1 (patch)
tree1af6969c9e18d9d60dccdd611ab0e29abece8ef9
parent3840a9c582652717e5ccd1892f73f0d940ad37ae (diff)
downloadskiboot-16aac05742dee3c80983145a6af6b2fc8a840ae1.zip
skiboot-16aac05742dee3c80983145a6af6b2fc8a840ae1.tar.gz
skiboot-16aac05742dee3c80983145a6af6b2fc8a840ae1.tar.bz2
opal-ci: Update qemu command line to test booting up
Starting with qemu 7.2, there's no longer any PCI root port configured when the '-nodefaults' option is used. Since that option is used and we include some PCI devices when we test booting with qemu, qemu 7.2 is throwing an error as it doesn't have a bus to attach the devices to. It's currently breaking the CI on Fedora rawhide, where qemu has been updated to version 7.2. Support for powernv in qemu has improved since the qemu-boot-check test was introduced and there's no good reason to run with '-nodefaults' any more. So this patch removes it. Which allows to also remove a few extra devices from the command line since the defaults are sane. And we can still attach PCI devices. Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com> Signed-off-by: Reza Arbab <arbab@linux.ibm.com>
-rwxr-xr-xtest/run_qemu_boot_test.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/run_qemu_boot_test.sh b/test/run_qemu_boot_test.sh
index d682a07..017b958 100755
--- a/test/run_qemu_boot_test.sh
+++ b/test/run_qemu_boot_test.sh
@@ -1,7 +1,6 @@
#!/bin/bash
-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"
+QEMU_ARGS="-M powernv"
QEMU_ARGS+=" -device pcie-pci-bridge,id=bridge1,bus=pcie.1,addr=0x0"
QEMU_ARGS+=" -device ich9-ahci,id=sata0,bus=pcie.0,addr=0x0"
QEMU_ARGS+=" -device e1000e,netdev=net0,bus=bridge1,addr=0x3 -netdev user,id=net0"