From nobody Fri May 17 10:13:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710501103; cv=none; d=zohomail.com; s=zohoarc; b=e1f2O9Sk9IdSI7Ro/B0va0ESZqhDo8zDTDK1c/irLSQEsmOMgE8+q0ckeLVa8Um2GXYRL9a/Gy9m1zkLb1YUaa6TpK3Jc07oaxYtcf5YU1czcEHQWVwup+qJtf+1fPuRSialKoMkTHpuqJeF5FQ4DfYmxhb+UF8tKUdrAbtZObo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710501103; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YXK1gONvmEboZ1YKHKYslRUL1tiV9A90eD4rfpt0x5I=; b=BO0D6H8dX0hsbSYU23Tkvcpgp2nHKoIM8sMVLKzvgQZEZUy2Z/biv4Bv/1MCUKryDUtBFY10Viy/ZfHSoQzL7i3EVnni44Bb2Ht4ZQJ2BbddwfWp/yWe90pLyhoh7aGUTnUpD0KfJVL7e7xlrQyGnThLvm0pTOmuM1EeEojbFS0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710501103797736.0751913296461; Fri, 15 Mar 2024 04:11:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl5TG-0000ya-Gp; Fri, 15 Mar 2024 07:11:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rl5T5-0000vk-DZ for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rl5T3-0006qE-Kw for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11:19 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-101-EaQwTSdENJCgPwj9YLa0NQ-1; Fri, 15 Mar 2024 07:11:12 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 25BEB8007A1; Fri, 15 Mar 2024 11:11:12 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45CCF2024517; Fri, 15 Mar 2024 11:11:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710501075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YXK1gONvmEboZ1YKHKYslRUL1tiV9A90eD4rfpt0x5I=; b=gkP1QaXS32HqdhdcI5d22AUXTsDAjD6ANKJrJX1DWbdErZ5Yd00ZeISz5qc2ee/IANMsme mQu0TczHRf4LW+p7qa1h0KWrdXFNULkZWap40o/Yu5zYWWAstHs3d1GRVeqlOUL9PY9bTN h8bnLW91UowntuI5q2LsimilybyTSPg= X-MC-Unique: EaQwTSdENJCgPwj9YLa0NQ-1 From: Thomas Huth To: Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org Cc: qemu-devel@nongnu.org Subject: [PATCH 1/9] tests/qemu-iotests: Fix test 033 for running with non-file protocols Date: Fri, 15 Mar 2024 12:11:00 +0100 Message-ID: <20240315111108.153201-2-thuth@redhat.com> In-Reply-To: <20240315111108.153201-1-thuth@redhat.com> References: <20240315111108.153201-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.987, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710501104199100001 Content-Type: text/plain; charset="utf-8" When running iotest 033 with the ssh protocol, it fails with: 033 fail [14:48:31] [14:48:41] 10.2s output misma= tch --- /.../tests/qemu-iotests/033.out +++ /.../tests/qemu-iotests/scratch/qcow2-ssh-033/033.out.bad @@ -174,6 +174,7 @@ 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) wrote 512/512 bytes at offset 2097152 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +qemu-io: warning: Failed to truncate the tail of the image: ssh driver do= es not support shrinking files read 512/512 bytes at offset 0 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) We already check for the qcow2 format here, so let's simply also add a check for the protocol here, too, to only test the truncation with the file protocol. Signed-off-by: Thomas Huth --- tests/qemu-iotests/033 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033 index da9133c44b..4bc7a071bd 100755 --- a/tests/qemu-iotests/033 +++ b/tests/qemu-iotests/033 @@ -123,9 +123,9 @@ do_test 512 "write -P 1 0 0x200" "$TEST_IMG" | _filter_= qemu_io # next L2 table do_test 512 "write -P 1 $L2_COVERAGE 0x200" "$TEST_IMG" | _filter_qemu_io =20 -# only interested in qcow2 here; also other formats might respond with -# "not supported" error message -if [ $IMGFMT =3D "qcow2" ]; then +# only interested in qcow2 with file protocol here; also other formats +# might respond with "not supported" error message +if [ $IMGFMT =3D "qcow2" ] && [ $IMGPROTO =3D "file" ]; then do_test 512 "truncate $L2_COVERAGE" "$TEST_IMG" | _filter_qemu_io fi =20 --=20 2.44.0 From nobody Fri May 17 10:13:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710501193; cv=none; d=zohomail.com; s=zohoarc; b=E5BJvCr5/vplzi/K9HKYfUFwPBROb/ZdyFLdeGdM9KjQdGKqUwTRxle7AdB8rqY/M4pkB9QxOp7sGqF10ShPSwsdOE9IwWxb6DZO+coIoYSOFNaO63I2jJ7FH2EIpgPP9fNKm0sj9+KJaoRO1q19YK0aOncmEmMLiMQqbkpWNGk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710501193; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BaXECQnDVcVTT1vA4BEmOwyQM1Q7T0aqsKHZZmv8ysk=; b=itQcLXYY4AqZr7OX/jQvU57Hg57k6mYsSl8kIlda/8ZKEl0QUAnwoCCvYF6vL8ogBDDmLj1Lw+CWqPFap/+TKDIbKhrvNU5fln0qflWo4Moc5uw7m58Fp+38urGyMCdIBy0BovREP/zyTMbdhmCl2AAZigNFibDKN6rwMG16+PA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710501193678176.44360895641444; Fri, 15 Mar 2024 04:13:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl5TN-00011c-MD; Fri, 15 Mar 2024 07:11:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rl5T6-0000wZ-MR for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11:20 -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 1rl5T4-0006rX-D1 for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11:20 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-516-jAY7g_dlM-CuebhKiPbKoA-1; Fri, 15 Mar 2024 07:11:13 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 95BD38007A1; Fri, 15 Mar 2024 11:11:13 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6920A202451F; Fri, 15 Mar 2024 11:11:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710501077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BaXECQnDVcVTT1vA4BEmOwyQM1Q7T0aqsKHZZmv8ysk=; b=CEjw3y2EpmYonpotFGAtgxURAGb+0QKpXIT/bWUgX62OKFOT5nSDwZUTY4ul/QnPRovffu wCa4lO0STrUtc5NIs7+9eLVbvcsPg2Z7AMYNuJkYUuo8ifAV4GfzhRDT2NEWI9jFI/2JG+ uyem/xyHGdlKh+rWCj+sys2krhjok7Y= X-MC-Unique: jAY7g_dlM-CuebhKiPbKoA-1 From: Thomas Huth To: Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org Cc: qemu-devel@nongnu.org Subject: [PATCH 2/9] tests/qemu-iotests: Restrict test 066 to the 'file' protocol Date: Fri, 15 Mar 2024 12:11:01 +0100 Message-ID: <20240315111108.153201-3-thuth@redhat.com> In-Reply-To: <20240315111108.153201-1-thuth@redhat.com> References: <20240315111108.153201-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.987, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710501194537100001 Content-Type: text/plain; charset="utf-8" The hand-crafted json statement in this test only works if the test is run with the "file" protocol, so mark this test accordingly. Signed-off-by: Thomas Huth --- tests/qemu-iotests/066 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066 index cf63144cb9..336d8565dd 100755 --- a/tests/qemu-iotests/066 +++ b/tests/qemu-iotests/066 @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # This tests qcow2-specific low-level functionality _supported_fmt qcow2 -_supported_proto generic +_supported_proto file # We need zero clusters and snapshots # (TODO: Consider splitting the snapshot part into a separate test # file, so this one runs with refcount_bits=3D1 and data_file) --=20 2.44.0 From nobody Fri May 17 10:13:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710501104; cv=none; d=zohomail.com; s=zohoarc; b=jhesYvXJerfjMvzvsTI8FUophjl3GL3Bz/nku9/XDgElBc7lThqbMIgLm+PAObSilnX9UQAQ7gAENE1nsTNmkja5OdRks6W72XJmps38+pOHQOa5TjpnCOKvZzag9QK8ORjSl1m71h+1uia5w7lIchnvHeLYQmFRp8B1mvLyxWc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710501104; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=U3J76+srI0y9x6WdENhqCOAiEhNSvhLsbyd+4+fGTwI=; b=YkVHP0Zh/bhnfPWgMeSYH3hS1PIzA6Exc3IAtkeozRZE9ouaGWxbl5CVrlGlL9atgZn4Mcc2HWVhVdcGg2Cegt42uysTn3aKfsvdLIFMnF5tcdGeap8VyvslDTqZsl5T4l8v4U7mZ5D6NA6tBc2GKHRixWPbNWCjv9rJPv8803E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710501104107664.164759423946; Fri, 15 Mar 2024 04:11:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl5T6-0000wY-NZ; Fri, 15 Mar 2024 07:11:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rl5T5-0000vq-ED for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11: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 1rl5T3-0006rH-Oi for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11:19 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-664-0B4upYqmM4OYfoNiilOWag-1; Fri, 15 Mar 2024 07:11:15 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 22EFF185A781; Fri, 15 Mar 2024 11:11:15 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 19A372024517; Fri, 15 Mar 2024 11:11:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710501077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U3J76+srI0y9x6WdENhqCOAiEhNSvhLsbyd+4+fGTwI=; b=SPwZmNrFAOLXUmW5k0nRl1MpKC8pkXIOPdDKhv8p5OL1n0xZF20F6/Q5T8W2QWf/+RkItz Srr8YBI/INGY1M9txk3l/OkH/n5wz60iTzGkpyKDNGHVZOEBesjWRWz9+38UyKNdsy8ezE yxoQr/1j5FIs9JveAZBnkKtQW+ucBwQ= X-MC-Unique: 0B4upYqmM4OYfoNiilOWag-1 From: Thomas Huth To: Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org Cc: qemu-devel@nongnu.org Subject: [PATCH 3/9] tests/qemu-iotests: Restrict test 114 to the 'file' protocol Date: Fri, 15 Mar 2024 12:11:02 +0100 Message-ID: <20240315111108.153201-4-thuth@redhat.com> In-Reply-To: <20240315111108.153201-1-thuth@redhat.com> References: <20240315111108.153201-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.987, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710501106188100005 Content-Type: text/plain; charset="utf-8" iotest 114 uses "truncate" and the qcow2.py script on the destination file, which both cannot deal with URIs. Thus this test needs the "file" protocol, otherwise it fails with an error message like this: truncate: cannot open 'ssh://127.0.0.1/tmp/qemu-build/tests/qemu-iotests/s= cratch/qcow2-ssh-114/t.qcow2.orig' for writing: No such file or directory Thus mark this test for "file protocol only" accordingly. Signed-off-by: Thomas Huth --- tests/qemu-iotests/114 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114 index de6fd327ee..dccc71008b 100755 --- a/tests/qemu-iotests/114 +++ b/tests/qemu-iotests/114 @@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter =20 _supported_fmt qcow2 -_supported_proto generic +_supported_proto file # At least OpenBSD doesn't seem to have truncate _supported_os Linux # qcow2.py does not work too well with external data files --=20 2.44.0 From nobody Fri May 17 10:13:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710501147; cv=none; d=zohomail.com; s=zohoarc; b=ZYKH8K5NdSBsNdQ5Fdf1QrzoMcKgv6N2oLft7/LDDYVgYlofJBmnKKmuky42Q/lOX4Y+cGKT9EDWi8afOKtCOrmvNpV+XtUs2F9VqHmIwyFMqiTv9E8h33llAWHnANCl3j1x2Ggge3Dq6iLz5NvZbPI9hwtVINPcuJ5eUWMvVcQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710501147; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Nzj1XiMv3xiPaLFGuhlAZRPrIrM2bzFR4QnkCdW4Eq0=; b=eqKTVRis4R02miIk96shKv57/NPSmAW0Xh82Yl5HpN7j+JTfwEJr9d8A1SZhtZpgPYNuO6MO2PRZqcyX30yH6VGzwkDSAlTUmVTm9cGilFZ7yNlL4okeVxl/elb+iml8r71tdCgiaCZGUVf8SNmHYtV7zjyIceVrGT59xbeOe/8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710501147750408.80808087424737; Fri, 15 Mar 2024 04:12:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl5TJ-00010D-OU; Fri, 15 Mar 2024 07:11:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rl5T7-0000wu-U1 for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rl5T5-0006ss-BM for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11:20 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-379-Pyyc1K8wOAG21dKIzPSKTw-1; Fri, 15 Mar 2024 07:11:16 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id A7DEE8007A1; Fri, 15 Mar 2024 11:11:16 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BA042022EDB; Fri, 15 Mar 2024 11:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710501078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Nzj1XiMv3xiPaLFGuhlAZRPrIrM2bzFR4QnkCdW4Eq0=; b=iG3b35LhRvYBXV3QzDag6fShBRUBB0vyIH7nQCahOMB7v38j2xdDdMZBMRci+4tZv7926c of1nTgVKsLN42Eef7Qk4yUzH9jrPOuBFuSCaicNzZa19qD+rVZnF9mYeAWsXTpqwW8f59i xHxBd0U0JWtDAGH5KHfm0Oxt4OrWRgA= X-MC-Unique: Pyyc1K8wOAG21dKIzPSKTw-1 From: Thomas Huth To: Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org Cc: qemu-devel@nongnu.org Subject: [PATCH 4/9] tests/qemu-iotests: Restrict test 130 to the 'file' protocol Date: Fri, 15 Mar 2024 12:11:03 +0100 Message-ID: <20240315111108.153201-5-thuth@redhat.com> In-Reply-To: <20240315111108.153201-1-thuth@redhat.com> References: <20240315111108.153201-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.987, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710501148311100001 Content-Type: text/plain; charset="utf-8" Using "-drive ...,backing.file.filename=3D..." only works with the file protocol, but not with URIs, so mark this test accordingly. Signed-off-by: Thomas Huth --- tests/qemu-iotests/130 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130 index 7257f09677..7af85d20a8 100755 --- a/tests/qemu-iotests/130 +++ b/tests/qemu-iotests/130 @@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.qemu =20 _supported_fmt qcow2 -_supported_proto generic +_supported_proto file _supported_os Linux # We are going to use lazy-refcounts _unsupported_imgopts 'compat=3D0.10' --=20 2.44.0 From nobody Fri May 17 10:13:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710501156; cv=none; d=zohomail.com; s=zohoarc; b=jVvvTbSl8paiVsqSsaPTk/K/Iw8ObE225wfNAk4sheq8WiEm4YUANroAWHUlUQz3cuUe2fljk5MRD1bJXjVt9J8HzBgkqCEaL9goPgL/AGGi9PEBY6YeAoKjLJqAbcv8MW23m5+8u3PV6hoAo6G0IF1BcV96247ktmqyiL9kkB0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710501156; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Kzrx5m6uabqM1vhnSUueyKq+Jz89fLh5eBJkoIrCcfw=; b=AK/v+mYBPIHw0SAYx7QfpLdJl+hcj3pvr2+I0A93Qi6Ym7kPJGx8kHDnHSuTXUzqtyOlNyUAjt4issXmItia1M+/EHT7U8fQAbugVQNMqOrCRsVq0BcLNebbPlOOjTjusJTh2kaxycH5aZ3pMhoF2qMLDCsuSiNSvGaOLmoOsBw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710501156306588.3372578006101; Fri, 15 Mar 2024 04:12:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl5TR-00012w-4j; Fri, 15 Mar 2024 07:11:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rl5TA-0000xE-2d for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rl5T8-0006uC-FB for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11:23 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-487-hNCGRyAtOAaDjX-T74uYpg-1; Fri, 15 Mar 2024 07:11:18 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 36DCB38157BA; Fri, 15 Mar 2024 11:11:18 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0CEB02024517; Fri, 15 Mar 2024 11:11:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710501080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kzrx5m6uabqM1vhnSUueyKq+Jz89fLh5eBJkoIrCcfw=; b=FTWgMpk77GVDqLWQ7umNy/QKA57p2wjqxemnA/bmZY9DWcrfly9iPcycBLDdYE5TtVHjPT 2fbinsN6l/BPsI6ER7jiZzv275cKXF8DgSwpTKNC/9s27orLVcH3WdasCLE42Rf4ugojf+ shzN3J1WX6Pq63qYhoiKa2FivvpFYvs= X-MC-Unique: hNCGRyAtOAaDjX-T74uYpg-1 From: Thomas Huth To: Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org Cc: qemu-devel@nongnu.org Subject: [PATCH 5/9] tests/qemu-iotests: Restrict test 134 and 158 to the 'file' protocol Date: Fri, 15 Mar 2024 12:11:04 +0100 Message-ID: <20240315111108.153201-6-thuth@redhat.com> In-Reply-To: <20240315111108.153201-1-thuth@redhat.com> References: <20240315111108.153201-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.987, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710501158353100003 Content-Type: text/plain; charset="utf-8" Commit b25b387fa592 updated the iotests 134 and 158 to use the --image-opts parameter for qemu-io with file protocol related options, but forgot to update the _supported_proto line accordingly. So let's do that now. Fixes: b25b387fa5 ("qcow2: convert QCow2 to use QCryptoBlock for encryption= ") Signed-off-by: Thomas Huth --- tests/qemu-iotests/134 | 2 +- tests/qemu-iotests/158 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134 index ded153c0b9..b2c3c03f08 100755 --- a/tests/qemu-iotests/134 +++ b/tests/qemu-iotests/134 @@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter =20 _supported_fmt qcow qcow2 -_supported_proto generic +_supported_proto file =20 =20 size=3D128M diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158 index a95878e4ce..3a9ad7eed0 100755 --- a/tests/qemu-iotests/158 +++ b/tests/qemu-iotests/158 @@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter =20 _supported_fmt qcow qcow2 -_supported_proto generic +_supported_proto file =20 =20 size=3D128M --=20 2.44.0 From nobody Fri May 17 10:13:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710501170; cv=none; d=zohomail.com; s=zohoarc; b=LA74r4Jq5mxxpfRZu0EXyREFKgESQ4zlsmpKspkJFKfG0O6G3FHwJQaaRoxaSqSfeBxHH7PdaVO5AIEM4BaGdoA1TUiImT5PfNd2ypvs5D4UelGohMH+tXQxPLEHqqjTBwaCHO5RrRM8z57iRbtbCEEsdg/gNLkFGtqVdcLxzMc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710501170; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jRWAmIUfoSdpoR0C99EKIAmjCjdtTAOA7tR36NKh9Dg=; b=DQvp9GL1YYLMuAN4a4Vbv0ODOvodLlyB5NeSuQmwfBxADXyUXI8AWiiXuzcLD8dI63q6h0eAz11/DSA0MdDHH//7kRu/iEVrN4mS5kba8SUh4cbf7IAZh/hf2KaUsMxFnUTvWOzAsNcVuHg2H3dYZ0foHER9hCEcppW2EVFj7iQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710501170178859.5385662724406; Fri, 15 Mar 2024 04:12:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl5TR-00012v-4O; Fri, 15 Mar 2024 07:11:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rl5TC-0000yQ-Ja for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rl5TA-0006w7-5Q for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11:26 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-1-SlNmIMZ_P6KbtD3uAoxU-A-1; Fri, 15 Mar 2024 07:11:20 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 09035101A523; Fri, 15 Mar 2024 11:11:20 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id ACCEC202451F; Fri, 15 Mar 2024 11:11:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710501083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jRWAmIUfoSdpoR0C99EKIAmjCjdtTAOA7tR36NKh9Dg=; b=jFP5FvlZpSJJPwatI+py3JRjKanrcZumD1FaNCVPZdoDPOVjD57ARDgA9EdvHG/xNl1cNF fSVQBqBL8Vcu6io5fbxz/Nepkr9fKPQWuTV6bDvfezH8SeFGNd5WcIJW0/FsiywcRFRTtv QPow1CxKqz66qopNq8Rko+DG10iaSjI= X-MC-Unique: SlNmIMZ_P6KbtD3uAoxU-A-1 From: Thomas Huth To: Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org Cc: qemu-devel@nongnu.org Subject: [PATCH 6/9] tests/qemu-iotests: Restrict test 156 to the 'file' protocol Date: Fri, 15 Mar 2024 12:11:05 +0100 Message-ID: <20240315111108.153201-7-thuth@redhat.com> In-Reply-To: <20240315111108.153201-1-thuth@redhat.com> References: <20240315111108.153201-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.987, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710501170357100001 Content-Type: text/plain; charset="utf-8" The test fails completely when you try to use it with a different protocol, e.g. with "./check -ssh -qcow2 156". The test uses some hand-crafted JSON statements which cannot work with other protocols, thus let's change this test to only support the 'file' protocol. Signed-off-by: Thomas Huth --- tests/qemu-iotests/156 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156 index a9540bd80d..97c2d86ce5 100755 --- a/tests/qemu-iotests/156 +++ b/tests/qemu-iotests/156 @@ -50,7 +50,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.qemu =20 _supported_fmt qcow2 qed -_supported_proto generic +_supported_proto file # Copying files around with cp does not work with external data files _unsupported_imgopts data_file =20 --=20 2.44.0 From nobody Fri May 17 10:13:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710501299; cv=none; d=zohomail.com; s=zohoarc; b=A0KNP9IZ8Ry8YLU8JLwEonvqcTWTp6QHnEJReG0Ekt/XGgIFwVM3/oOYJYhy1+deveBexi4luJVaYuwio0dSkSifTT/lnDy9pez96F2Ud9n37gYURZzsWqFJQU92TgkHeqXkLL7D01or/vEAvommrBz89khzu9tNJ6EMC8b9+nI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710501299; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=1GzpX5M/vVosor6mOKBg/wyW648ebLEyIpXtehNEt5E=; b=lga4ea9o9TDHuCTw6voj4f3Fe5I1v88FueTHWS3M9NhnFu5axePiu6n3ExEhi/LhRr9Jlisd9lgZ+O8ufdnUs3E+4QFMnPkrzvp7IJ9llMPs9wQjvY9KE4/lF8/Kwlk4anz7aHc5OBHrSCRh190TEDO6GByxxGQHt3DFWLAkbYs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710501299238803.071261601574; Fri, 15 Mar 2024 04:14:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl5TV-0001E1-8K; Fri, 15 Mar 2024 07:11:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rl5TD-0000yX-6i for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11:28 -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 1rl5TB-0006wG-C1 for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11:26 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-616-VGCPr6nKNAGgqb-0diPpgg-1; Fri, 15 Mar 2024 07:11:22 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 961B81C02164; Fri, 15 Mar 2024 11:11:21 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 67F7C2024517; Fri, 15 Mar 2024 11:11:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710501083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1GzpX5M/vVosor6mOKBg/wyW648ebLEyIpXtehNEt5E=; b=EXF98c4ntQaXovtwh2RfHC9RkRo2pnrmzmWtaZQ2dr6ikuYFCUJuq9D1/4vVFSEiTa8nGW 3jabb70b9E2P+8kIRLaTBUq8+HB44d6/MAp3W76455m5TCz3//zjjrLVR388sz1Pt1ojdt euBrSbweO0oVzx9DIXLX2NwSkCa5+UI= X-MC-Unique: VGCPr6nKNAGgqb-0diPpgg-1 From: Thomas Huth To: Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org Cc: qemu-devel@nongnu.org Subject: [PATCH 7/9] tests/qemu-iotests: Restrict tests that use --image-opts to the 'file' protocol Date: Fri, 15 Mar 2024 12:11:06 +0100 Message-ID: <20240315111108.153201-8-thuth@redhat.com> In-Reply-To: <20240315111108.153201-1-thuth@redhat.com> References: <20240315111108.153201-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.987, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710501300756100003 Content-Type: text/plain; charset="utf-8" These tests 188, 189 and 198 use qemu-io with --image-opts with additional hard-coded parameters for the file protocol, so they cannot work for other protocols. Thus we have to limit these tests to the file protocol only. Signed-off-by: Thomas Huth --- tests/qemu-iotests/188 | 2 +- tests/qemu-iotests/189 | 2 +- tests/qemu-iotests/198 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/188 b/tests/qemu-iotests/188 index ce087d1873..2950b1dc31 100755 --- a/tests/qemu-iotests/188 +++ b/tests/qemu-iotests/188 @@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter =20 _supported_fmt qcow2 -_supported_proto generic +_supported_proto file _supported_os Linux _require_working_luks =20 diff --git a/tests/qemu-iotests/189 b/tests/qemu-iotests/189 index 801494c6b9..008f73b07d 100755 --- a/tests/qemu-iotests/189 +++ b/tests/qemu-iotests/189 @@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter =20 _supported_fmt qcow2 -_supported_proto generic +_supported_proto file _supported_os Linux _require_working_luks =20 diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198 index 1c93dea1f7..6ddeffddd2 100755 --- a/tests/qemu-iotests/198 +++ b/tests/qemu-iotests/198 @@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter =20 _supported_fmt qcow2 -_supported_proto generic +_supported_proto file _supported_os Linux _require_working_luks =20 --=20 2.44.0 From nobody Fri May 17 10:13:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710501263; cv=none; d=zohomail.com; s=zohoarc; b=isS3kJLgKeZPH4ALlU10O/3wmW+iMv4d0G64oXUvxfYHPcgx6G2TgI7pdNkPxMl53YImwcyz3qj48UszYdUt4I2kGtY4Bx6lu1nylK9lsXOaLn1ODaTquW5FXNtzKDfUP6bQrKqlqJOWa9c4y5co+WQERPquYtA8USXJHY09kZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710501263; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2Sm2KuY35lPtQtAoj5GSSHTXjNbojrvZZnCCJdxh9g4=; b=Jnub8I65QeiAH5eNIGKkgGa8gRXIcmlD+DRV3V5GTYhL7zWwGo2elQap4YaNKvbMwoOe/p9ha5MxrltVPryAfM0A4uOoLMq5GgV35A0mndBZXFLxWTuApyfs6Ntxq2LnqFpznoYKkeFvJXZ53nMiCxNQC97X+OISeoHaYny0vhk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710501263178602.7942866294151; Fri, 15 Mar 2024 04:14:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl5TV-0001Hz-SX; Fri, 15 Mar 2024 07:11:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rl5TG-0000zk-MK for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11:30 -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 1rl5TE-0006xE-26 for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11:30 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-86-1f-WNMqhOReS-Vi7VZjSnw-1; Fri, 15 Mar 2024 07:11:23 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 13F3D38157BC; Fri, 15 Mar 2024 11:11:23 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id D83452022EDB; Fri, 15 Mar 2024 11:11:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710501086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2Sm2KuY35lPtQtAoj5GSSHTXjNbojrvZZnCCJdxh9g4=; b=W/fw56KJzVF4q0O73YxiXiFey/YG6X+tWkqX6riG5M095xFhsmwo7ZTRmAdAzjahB2Ekts N2G4fHcWwPm94PpbuRyKOzu2MkRhFo2kEC/yDSHSK6BU9u7ZzlcFofNSrZcuWCWHf6EAAz asMgdEFN+pTOsgR0z80fDVOWTmcIjgg= X-MC-Unique: 1f-WNMqhOReS-Vi7VZjSnw-1 From: Thomas Huth To: Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org Cc: qemu-devel@nongnu.org Subject: [PATCH 8/9] tests/qemu-iotests: Fix some tests that use --image-opts for other protocols Date: Fri, 15 Mar 2024 12:11:07 +0100 Message-ID: <20240315111108.153201-9-thuth@redhat.com> In-Reply-To: <20240315111108.153201-1-thuth@redhat.com> References: <20240315111108.153201-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.987, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710501264678100001 Content-Type: text/plain; charset="utf-8" Tests 263, 284 and detect-zeroes-registered-buf use qemu-io with --image-opts so we have to enforce IMGOPTSSYNTAX=3Dtrue here to get $TEST_IMG in shape for other protocols than "file". Signed-off-by: Thomas Huth --- tests/qemu-iotests/263 | 6 ++++-- tests/qemu-iotests/284 | 7 +++---- tests/qemu-iotests/tests/detect-zeroes-registered-buf | 4 +++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/qemu-iotests/263 b/tests/qemu-iotests/263 index ec09b41405..44fdada0d6 100755 --- a/tests/qemu-iotests/263 +++ b/tests/qemu-iotests/263 @@ -34,6 +34,8 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 +IMGOPTSSYNTAX=3Dtrue + # get standard environment, filters and checks . ./common.rc . ./common.filter @@ -73,7 +75,7 @@ echo "testing LUKS qcow2 encryption" echo =20 _make_test_img --object $SECRET -o "encrypt.format=3Dluks,encrypt.key-secr= et=3Dsec0,encrypt.iter-time=3D10,cluster_size=3D64K" $size -_run_test "driver=3D$IMGFMT,encrypt.key-secret=3Dsec0,file.filename=3D$TES= T_IMG" +_run_test "$TEST_IMG,encrypt.key-secret=3Dsec0" _cleanup_test_img =20 echo @@ -82,7 +84,7 @@ echo =20 =20 _make_test_img --object $SECRET -o "encrypt.format=3Daes,encrypt.key-secre= t=3Dsec0,cluster_size=3D64K" $size -_run_test "driver=3D$IMGFMT,encrypt.key-secret=3Dsec0,file.filename=3D$TES= T_IMG" +_run_test "$TEST_IMG,encrypt.key-secret=3Dsec0" _cleanup_test_img =20 =20 diff --git a/tests/qemu-iotests/284 b/tests/qemu-iotests/284 index 5a82639e7f..722267486d 100755 --- a/tests/qemu-iotests/284 +++ b/tests/qemu-iotests/284 @@ -33,6 +33,8 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 +IMGOPTSSYNTAX=3Dtrue + # get standard environment, filters and checks . ./common.rc . ./common.filter @@ -47,14 +49,12 @@ size=3D1M =20 SECRET=3D"secret,id=3Dsec0,data=3Dastrochicken" =20 -IMGSPEC=3D"driver=3D$IMGFMT,file.filename=3D$TEST_IMG,encrypt.key-secret= =3Dsec0" QEMU_IO_OPTIONS=3D$QEMU_IO_OPTIONS_NO_FMT =20 _run_test() { - IMGOPTSSYNTAX=3Dtrue OLD_TEST_IMG=3D"$TEST_IMG" - TEST_IMG=3D"driver=3D$IMGFMT,file.filename=3D$TEST_IMG,encrypt.key= -secret=3Dsec0" + TEST_IMG=3D"$TEST_IMG,encrypt.key-secret=3Dsec0" QEMU_IMG_EXTRA_ARGS=3D"--image-opts --object $SECRET" =20 echo @@ -78,7 +78,6 @@ _run_test() =20 TEST_IMG=3D"$OLD_TEST_IMG" QEMU_IMG_EXTRA_ARGS=3D - IMGOPTSSYNTAX=3D } =20 =20 diff --git a/tests/qemu-iotests/tests/detect-zeroes-registered-buf b/tests/= qemu-iotests/tests/detect-zeroes-registered-buf index edb5f2cee5..5eaf34e5a6 100755 --- a/tests/qemu-iotests/tests/detect-zeroes-registered-buf +++ b/tests/qemu-iotests/tests/detect-zeroes-registered-buf @@ -36,6 +36,8 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 +IMGOPTSSYNTAX=3Dtrue + # get standard environment, filters and checks cd .. . ./common.rc @@ -46,7 +48,7 @@ _supported_proto generic =20 size=3D128M _make_test_img $size -IMGSPEC=3D"driver=3D$IMGFMT,file.filename=3D$TEST_IMG,discard=3Dunmap,dete= ct-zeroes=3Dunmap" +IMGSPEC=3D"$TEST_IMG,discard=3Dunmap,detect-zeroes=3Dunmap" =20 echo echo "=3D=3D writing zero buffer to image =3D=3D" --=20 2.44.0 From nobody Fri May 17 10:13:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710501422; cv=none; d=zohomail.com; s=zohoarc; b=m5xGGcLSUl7YTbdNWoyACrjJl55H1JpZUAZmqUrBo47Cq8WCpjO/1QBGuaTNvHX/05KZw1fkZWhVb9p5gwBciIFYw+8ULxW6AGDPr6fKXowjuhafvaNffSS5mREQOPYCUj1hrUxc18Sup0DUFElgmTPjdh5M6bvIYiWcsQtiqws= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710501422; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0ZqJy2ZnLRm2fqfzUBMLT4z9mGg35HiFBVc7dTa1P9Y=; b=GfWdjr7RZWxeJctrdBgpJr1N5TcHr5JJDCJaSy51v9EzTF7z+PUIEYjwGSGElI0V+rQfVqA3NmH45RvdHSa/biJTO410SRDE32vJiy9N1nXFGKKx1zIis19bxaQsYUlouKNcDqp581cuIfr2uyBC/fZefUt364+ZTsoMomn7R6g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710501422555966.0862687013728; Fri, 15 Mar 2024 04:17:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl5TX-0001KQ-Om; Fri, 15 Mar 2024 07:11:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rl5TH-00010c-5p for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rl5TF-0006xZ-GT for qemu-devel@nongnu.org; Fri, 15 Mar 2024 07:11:30 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-563-9FMg29EQMu-6yVP5SAlg_A-1; Fri, 15 Mar 2024 07:11:24 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3D93C1C0216F; Fri, 15 Mar 2024 11:11:24 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6671C2024517; Fri, 15 Mar 2024 11:11:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710501087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0ZqJy2ZnLRm2fqfzUBMLT4z9mGg35HiFBVc7dTa1P9Y=; b=g+6/O8oxPp6bYnzXWCLzvThszwiF9SaiHPtsi5xw6kWzLk+dKLogPFnCK/UFE8G7Zdz263 ean8iVPztuI+GSQYVkIhkjWuyXzNCcePS0gOanxzY8+KfhmvO2l+KAtCrQj7UIOi6+xuD7 oLYuFPUF0meu5iyYP3hhkGWiiauRy5E= X-MC-Unique: 9FMg29EQMu-6yVP5SAlg_A-1 From: Thomas Huth To: Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org Cc: qemu-devel@nongnu.org Subject: [PATCH 9/9] tests/qemu-iotests: Restrict tests using "--blockdev file" to the file protocol Date: Fri, 15 Mar 2024 12:11:08 +0100 Message-ID: <20240315111108.153201-10-thuth@redhat.com> In-Reply-To: <20240315111108.153201-1-thuth@redhat.com> References: <20240315111108.153201-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.987, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710501423127100001 Content-Type: text/plain; charset="utf-8" Tests that use "--blockdev" with the "file" driver cannot work with other protocols, so we should mark them accordingly. Signed-off-by: Thomas Huth --- tests/qemu-iotests/tests/qcow2-internal-snapshots | 2 +- tests/qemu-iotests/tests/qsd-jobs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/tests/qcow2-internal-snapshots b/tests/qemu= -iotests/tests/qcow2-internal-snapshots index 36523aba06..9f83aa8903 100755 --- a/tests/qemu-iotests/tests/qcow2-internal-snapshots +++ b/tests/qemu-iotests/tests/qcow2-internal-snapshots @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # This tests qcow2-specific low-level functionality _supported_fmt qcow2 -_supported_proto generic +_supported_proto file # Internal snapshots are (currently) impossible with refcount_bits=3D1, # and generally impossible with external data files _unsupported_imgopts 'compat=3D0.10' 'refcount_bits=3D1[^0-9]' data_file diff --git a/tests/qemu-iotests/tests/qsd-jobs b/tests/qemu-iotests/tests/q= sd-jobs index 510bf0a9dc..9b843af631 100755 --- a/tests/qemu-iotests/tests/qsd-jobs +++ b/tests/qemu-iotests/tests/qsd-jobs @@ -40,7 +40,7 @@ cd .. . ./common.filter =20 _supported_fmt qcow2 -_supported_proto generic +_supported_proto file =20 size=3D128M =20 --=20 2.44.0