Date: Tue, 30 Apr 2019 15:28:52 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346961 - head/tools/boot Message-ID: <201904301528.x3UFSqX0009424@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Tue Apr 30 15:28:52 2019 New Revision: 346961 URL: https://svnweb.freebsd.org/changeset/base/346961 Log: revert QEMU q35 platform use from r346748 It seems to be incompatible with the OVMF.fd (of unknown provenance) in use by the Cirrus-CI config. We will soon have a known OVMF build via a port/package (see review D19869) and we can switch back to q35 once packages are available. Discussed with: bcran Modified: head/tools/boot/ci-qemu-test.sh Modified: head/tools/boot/ci-qemu-test.sh ============================================================================== --- head/tools/boot/ci-qemu-test.sh Tue Apr 30 14:44:39 2019 (r346960) +++ head/tools/boot/ci-qemu-test.sh Tue Apr 30 15:28:52 2019 (r346961) @@ -97,7 +97,7 @@ trap tempdir_cleanup EXIT SIGINT SIGHUP SIGTERM SIGQUI # And, boot in QEMU. : ${BOOTLOG:=${TMPDIR:-/tmp}/ci-qemu-test-boot.log} timeout 300 \ - qemu-system-x86_64 -M q35 -m 256M -nodefaults \ + qemu-system-x86_64 -m 256M -nodefaults \ -drive if=pflash,format=raw,readonly,file=${OVMF} \ -serial stdio -vga none -nographic -monitor none \ -snapshot -hda fat:${ROOTDIR} 2>&1 | tee ${BOOTLOG}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904301528.x3UFSqX0009424>