From nobody Fri Jul 25 21:52:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bphSX2Mpxz62PmG; Fri, 25 Jul 2025 21:53:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bphSW6SvMz3hdF; Fri, 25 Jul 2025 21:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753480379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IsbrlnGtGpq4jbme4enR31vwHp1EhfhMFJY5mv6zRc8=; b=q+i6ikcGkZW27syLjhtqpVTckRx8oaRhnD8V2RznsvWv1Ngkk9gztNCLNwXvf/h/blCN2d DENi/nd3wKRNiADjvsabwDtGLoCQbL6bQ8EkgoFJIvkCB5Vfdoqn70RC3Kt5ZTolzB4YwG lo99qfKw0g+43RPKqqweEIcFKca0gbMQ4HG0mis6+lE4GnE5LTe/y4/VWwLn2Od3xWeSJD /784UtXfLLYtNmHQ3jb+loU4CNfnJAp+9NFzu7fEFLQQdP0No5z+ec2nuRir/B++R+cpEe Bc4EoutYb+BCTrsspccbvzHpSCOmC7Ys8pVRMvvNcI+hjCQhl6tQB+svD1IXEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753480379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IsbrlnGtGpq4jbme4enR31vwHp1EhfhMFJY5mv6zRc8=; b=U70qCFrw9ngYvIcmcOVuRvSAETmlbkTrceTe1tLhgLSpwmxMC3j5AvhSVqsNtrI3fNvpul YDiAn7Zio6JqRTF/rUTg0kOSsCd1nBtNQeR1nHhG+Dx+9PnaHDLDZkymH+AwzZdcEqVCgB q+4GYvEiitxU3b75q1axM5JpjkkLtS9PAQWAH7QhuaYCe9Uy6y6C6owd2luSslDAfM6I6w HgOxY9EnSdQtrBgzJA2M/eS7gWoRAl7VOvJJzLHfZH0VJsGgeYNAjZfXoZqCrHKCJ3lrqm MdGnj5VvEA75hKcWX3XmLT/HdlR0TEeCKCYbfTG3cOlXDrbl46tGRRnAmZ6Gww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753480379; a=rsa-sha256; cv=none; b=OEiR903t71unOGGDnTRlHcxirho4SbC9nDp8JrLxzejngJnPMn66OFoQLS3Y/oSMGA1gEI dLsvyeO7rJCQlMVO1/kA6U2OXI086x+Sq51BWWVKsj/SM6Ft+hlKWNLw1UY6lOSXiPcdq+ szHVWEx2U17GBL6y/rnqX85cvul9iNPmm0oO8hnI6B1tNHPJZjPIGs1LjBiMnrwo5MU+7z 80H9ZT9OyByMJSpBkKB+H0GLDgbIaqAIRAu/AOXJg5D5hI5vA3HEh3Yp+ndLmjzBw+KR2N HRz0eM3UP2nDwlDyTI168QI8GrAfUXJcDXqtojRwuOrI2ICEsdnbvpy2f4h77g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bphSW5sbjz11yn; Fri, 25 Jul 2025 21:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56PLqxlL099594; Fri, 25 Jul 2025 21:52:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56PLqxMM099591; Fri, 25 Jul 2025 21:52:59 GMT (envelope-from git) Date: Fri, 25 Jul 2025 21:52:59 GMT Message-Id: <202507252152.56PLqxMM099591@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 9ec37e8ff49c - main - tests/ci: Use QEMU blockdev declaration for all platforms List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ec37e8ff49c6b555e8d4f522adc9378157df170 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=9ec37e8ff49c6b555e8d4f522adc9378157df170 commit 9ec37e8ff49c6b555e8d4f522adc9378157df170 Author: Siva Mahadevan AuthorDate: 2025-07-25 21:46:08 +0000 Commit: Li-Wen Hsu CommitDate: 2025-07-25 21:52:32 +0000 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. files. Signed-off-by: Siva Mahadevan Reviewed by: imp, lwhsu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51479 --- tests/ci/Makefile | 8 +++++--- tests/ci/Makefile.aarch64 | 2 +- tests/ci/Makefile.armv7 | 2 +- tests/ci/Makefile.powerpc64 | 1 - tests/ci/Makefile.powerpc64le | 1 - tests/ci/Makefile.riscv64 | 1 - 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