From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5DD29CD343F for ; Fri, 15 May 2026 14:48:59 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtps-0004lT-So; Fri, 15 May 2026 10:48:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wNtpr-0004l7-Ew for qemu-devel@nongnu.org; Fri, 15 May 2026 10:48:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wNtpp-0000NQ-25 for qemu-devel@nongnu.org; Fri, 15 May 2026 10:48:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778856495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cT9WgErXXyNjjWT//QnwQfcGCsY8KDdlyCMePCbWhhc=; b=JVlq/N+2UznkThto3L9hfqHxzTu12SS0SFSpDjZAHszxShTMQ/bypzz+Pcvp1eHjp4NBVI CeDqB958d9B1vHLl2q5/8Z57+5prtvljq9klxq/nTIv8qdj6yZCJ0mEz34wUD38vfexRJH NtMvuNZgBbFXbZz0rcisOmionY3ceDE= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-140-5ogrFIcsO5i71XZesvX4fA-1; Fri, 15 May 2026 10:48:13 -0400 X-MC-Unique: 5ogrFIcsO5i71XZesvX4fA-1 X-Mimecast-MFC-AGG-ID: 5ogrFIcsO5i71XZesvX4fA_1778856492 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 264CB1800617; Fri, 15 May 2026 14:48:12 +0000 (UTC) Received: from redhat.com (unknown [10.44.49.123]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id ACEA1180034E; Fri, 15 May 2026 14:48:08 +0000 (UTC) Date: Fri, 15 May 2026 16:48:06 +0200 From: Kevin Wolf To: Daniel =?iso-8859-1?Q?P=2E_Berrang=E9?= Cc: qemu-devel@nongnu.org, Paolo Bonzini , Pierrick Bouvier , Alex =?iso-8859-1?Q?Benn=E9e?= , qemu-block@nongnu.org, John Snow , Pierrick Bouvier , Hanna Reitz , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , Cleber Rosa , Thomas Huth Subject: Re: [PATCH v6 11/16] tests: use 'driver' as collective term for either format or protocol Message-ID: References: <20260513120003.226790-1-berrange@redhat.com> <20260513120003.226790-12-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20260513120003.226790-12-berrange@redhat.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Received-SPF: pass client-ip=170.10.133.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Am 13.05.2026 um 13:59 hat Daniel P. Berrangé geschrieben: > The I/O tests integration previously exclusively tested block formats > and now also covers the NBD protocol. Replace references to 'format' > with 'driver', as a generic term to collectively apply to either a > format or protocol. > > Reviewed-by: Pierrick Bouvier > Signed-off-by: Daniel P. Berrangé > --- > docs/devel/testing/main.rst | 13 +++++++------ > tests/Makefile.include | 4 ++-- > tests/qemu-iotests/meson.build | 6 +++--- > 3 files changed, 12 insertions(+), 11 deletions(-) > > diff --git a/docs/devel/testing/main.rst b/docs/devel/testing/main.rst > index 8067d0a3ed..797111009a 100644 > --- a/docs/devel/testing/main.rst > +++ b/docs/devel/testing/main.rst > @@ -222,7 +222,8 @@ check-block > ~~~~~~~~~~~ > > There are a variety of ways to exercise the block layer I/O tests > -via make targets. > +via make targets for a selection of formats / protocols (collectively > +referred to as ``drivers`` below). > > A default ``make check`` or ``make check-block`` command will exercise > the ``qcow2`` format, using the tests tagged into the ``auto`` group > @@ -231,14 +232,14 @@ only. > These targets accept the ``SPEED`` variable to augment the set of tests > to run. A slightly more comprehensive test plan can be run by defining > ``SPEED=slow``, which enables all tests for the ``qcow2`` and ``raw`` > -formats. The most comprehensive test plan can be run by defining > -``SPEED=thorough``, which enables all available tests for the formats > +drivers. The most comprehensive test plan can be run by defining > +``SPEED=thorough``, which enables all available tests for the drivers > ``luks``, ``nbd``, ``parallels``, ``qcow2``, ``qed``, ``raw``, ``vdi``, > ``vhdx``, ``vmdk``, and ``vpc``. > > -Each of formats also has its own dedicated make target, named > -``make check-block-$FORMAT`` which will run all available tests for > -the designated format and does not require the ``SPEED`` variable > +Each of drivers also has its own dedicated make target, named > +``make check-block-$DRIVER`` which will run all available tests for > +the designated driver and does not require the ``SPEED`` variable > to be set. > > See the "QEMU iotests" section below for more information on the > diff --git a/tests/Makefile.include b/tests/Makefile.include > index a820980bbe..a063a1d60f 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -14,8 +14,8 @@ check-help: > @echo " $(MAKE) check-unit Run qobject tests" > @echo " $(MAKE) check-qapi-schema Run QAPI schema tests" > @echo " $(MAKE) check-tracetool Run tracetool generator tests" > - @echo " $(MAKE) check-block Run block tests (all formats)" > - @echo " $(MAKE) check-block-FORMAT Run block tests (only for FORMAT)" > + @echo " $(MAKE) check-block Run block tests (all formats/protocols)" > + @echo " $(MAKE) check-block-DRIVER Run block tests (only for format/protocol 'DRIVER')" > ifneq ($(filter $(all-check-targets), check-softfloat),) > @echo " $(MAKE) check-softfloat Run FPU emulation tests" > @echo " $(MAKE) check-tcg Run TCG tests" > diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build > index 744d0b6e88..5d6b0b5ed9 100644 > --- a/tests/qemu-iotests/meson.build > +++ b/tests/qemu-iotests/meson.build > @@ -12,7 +12,7 @@ qemu_iotests_binaries = [qemu_img, qemu_io, qemu_nbd, qsd] > qemu_iotests_env = {'PYTHON': python.full_path()} > # If altering this definition, also update docs/devel/testing/main.rst > # section on 'check-block' targets to reflect the changes > -qemu_iotests_formats = { > +qemu_iotests_drivers = { > 'qcow2': 'quick', > 'raw': 'slow', > 'luks': 'thorough', > @@ -33,8 +33,8 @@ endforeach > > qemu_iotests_check_cmd = files('check') > > -foreach format, speed: qemu_iotests_formats > - # Formats tagged 'quick' get the subset of tests in the 'auto' > +foreach format, speed: qemu_iotests_drivers > + # Drivers tagged 'quick' get the subset of tests in the 'auto' > # group, run by default with 'make check' / 'make check-block' > seen = [] > if speed == 'quick' If we're updating code and comments internally, we should probably do so consistently. In the code, this foreach still uses a variable 'format', and in the comments below we still have: # Every format gets put in the format specific suite suites = ['block-' + format + '-optional'] # Any format tagged quick or slow also gets added to slow # otherwise its tagged thorough if speed != 'thorough' ... Kevin