| Message ID | 20230105175649.543043-1-fbarrat@linux.ibm.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | opal-ci: Update qemu command line to test booting up | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/github-Docker_builds_and_checks | success | Successfully ran 9 jobs. |
On Thu, Jan 05, 2023 at 06:56:49PM +0100, Frederic Barrat wrote: >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. Applied to master.
diff --git a/test/run_qemu_boot_test.sh b/test/run_qemu_boot_test.sh index d682a070..017b9589 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"
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> --- test/run_qemu_boot_test.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)