tests/ci: Use QEMU blockdev declaration for all platforms

This patch uses the QEMU manpage-recommended '-blockdev' option instead
of '-drive' to declare block devices. This also makes the mandatory
'-device' declarations constant across all platforms, which fixes the
missing QEMU_DEVICES tarfs device declarations on all Makefile.<arch>
files.

Signed-off-by: Siva Mahadevan <me@svmhdvn.name>
Reviewed by:	imp, lwhsu
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D51479

6 files changed, 7 insertions, 8 deletions

diff --git a/tests/ci/Makefile b/tests/ci/Makefile
index 964664cbfbb9..48e638fdb79c 100644
--- a/tests/ci/Makefile
+++ b/tests/ci/Makefile
@@ -110,7 +110,7 @@ QEMUTGT=portinstall-qemu
 .  endif
 .endif
 QEMUTGT?=
-QEMU_DEVICES?=-device virtio-blk,drive=hd0 -device virtio-blk,drive=hd1
+QEMU_DEVICES?=
 QEMU_EXTRA_PARAM?=
 QEMU_MACHINE?=virt
 QEMUBIN=/usr/local/bin/qemu-system-${QEMU_ARCH}
@@ -237,8 +237,10 @@ ci-runtest: ci-buildimage-${TARGET_ARCH:tl} portinstall .PHONY
 		-nographic \
 		-no-reboot \
 		${QEMU_EXTRA_PARAM} \
-		-drive if=none,file=${CIDISK},format=raw,id=hd0 \
-		-drive if=none,file=${META_TAR},format=raw,id=hd1 \
+		-device virtio-blk,drive=hd0 \
+		-device virtio-blk,drive=hd1 \
+		-blockdev driver=raw,node-name=hd0,file.driver=file,file.filename=${CIDISK} \
+		-blockdev driver=raw,node-name=hd1,file.driver=file,file.filename=${META_TAR} \
 		${QEMU_DEVICES}
 .endif
 
diff --git a/tests/ci/Makefile.aarch64 b/tests/ci/Makefile.aarch64
index 9cbec6010a36..5a62e73d8eaa 100644
--- a/tests/ci/Makefile.aarch64
+++ b/tests/ci/Makefile.aarch64
@@ -8,7 +8,7 @@
 # CI Makefile for aarch64.
 #
 QEMU_ARCH=aarch64
-QEMU_DEVICES=-device virtio-blk,drive=hd0 -device ahci,id=ahci
+QEMU_DEVICES=-device ahci,id=ahci
 QEMU_EXTRA_PARAM=-bios /usr/local/share/u-boot/u-boot-qemu-arm64/u-boot.bin -cpu cortex-a57
 QEMU_MAX_CPU_COUNT=64
 QEMU_MAX_MEM_SIZE=64
diff --git a/tests/ci/Makefile.armv7 b/tests/ci/Makefile.armv7
index 21ee6b387b05..3b0d180fa352 100644
--- a/tests/ci/Makefile.armv7
+++ b/tests/ci/Makefile.armv7
@@ -8,7 +8,7 @@
 # CI Makefile for armv7.
 #
 QEMU_ARCH=arm
-QEMU_DEVICES=-device virtio-blk,drive=hd0 -device ahci,id=ahci
+QEMU_DEVICES=-device ahci,id=ahci
 QEMU_EXTRA_PARAM=-bios /usr/local/share/u-boot/u-boot-qemu-arm/u-boot.bin
 QEMU_MAX_CPU_COUNT=1
 QEMU_MAX_MEM_SIZE=3
diff --git a/tests/ci/Makefile.powerpc64 b/tests/ci/Makefile.powerpc64
index 26712b45f30b..d4e8e2cdc778 100644
--- a/tests/ci/Makefile.powerpc64
+++ b/tests/ci/Makefile.powerpc64
@@ -8,7 +8,6 @@
 # CI Makefile for powerpc64.
 #
 QEMU_ARCH=ppc64
-QEMU_DEVICES=-device virtio-blk,drive=hd0
 QEMU_EXTRA_PARAM=-vga none -accel tcg,thread=multi
 QEMU_MACHINE=pseries,cap-hpt-max-page-size=16M
 QEMU_MAX_CPU_COUNT=1
diff --git a/tests/ci/Makefile.powerpc64le b/tests/ci/Makefile.powerpc64le
index 974ab04b8eed..60c255f569fa 100644
--- a/tests/ci/Makefile.powerpc64le
+++ b/tests/ci/Makefile.powerpc64le
@@ -8,7 +8,6 @@
 # CI Makefile for powerpc64le.
 #
 QEMU_ARCH=ppc64
-QEMU_DEVICES=-device virtio-blk,drive=hd0
 QEMU_EXTRA_PARAM=-vga none -accel tcg,thread=multi
 QEMU_MACHINE=pseries,cap-hpt-max-page-size=16M
 QEMU_MAX_CPU_COUNT=1
diff --git a/tests/ci/Makefile.riscv64 b/tests/ci/Makefile.riscv64
index 749df3f0b369..d494fc4f43f5 100644
--- a/tests/ci/Makefile.riscv64
+++ b/tests/ci/Makefile.riscv64
@@ -8,7 +8,6 @@
 # CI Makefile for riscv64.
 #
 QEMU_ARCH=riscv64
-QEMU_DEVICES=-device virtio-blk-device,drive=hd0
 QEMU_EXTRA_PARAM=-bios /usr/local/share/opensbi/lp64/generic/firmware/fw_jump.elf -kernel /usr/local/share/u-boot/u-boot-qemu-riscv64/u-boot.bin
 QEMU_MAX_CPU_COUNT=16
 QEMU_MAX_MEM_SIZE=64