From nobody Wed May 15 10:22:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648033123834628.2980000437203; Wed, 23 Mar 2022 03:58:43 -0700 (PDT) Received: from localhost ([::1]:33808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWyhO-0007Xu-Sm for importer@patchew.org; Wed, 23 Mar 2022 06:58:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWyeJ-00042w-7Z for qemu-devel@nongnu.org; Wed, 23 Mar 2022 06:55:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:30196) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWyeH-00026L-6L for qemu-devel@nongnu.org; Wed, 23 Mar 2022 06:55:30 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-106-GcI-TyjHOh6z61olD8EhhA-1; Wed, 23 Mar 2022 06:55:26 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2D2421C07823; Wed, 23 Mar 2022 10:55:26 +0000 (UTC) Received: from localhost (unknown [10.39.195.65]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D98F953D8; Wed, 23 Mar 2022 10:55:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648032928; 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=Rg/O0JqzJP4qAmCIkxmC5p4YO/1sEThHgg6yLdu0SbE=; b=Y6fC2RAQSGLrT7/0HOPpdcTKkYy7aFzO/F5MWVp5mCfUPoLAhba8PD+7JxvZp2vHExlM4s P5A3P5I+3UJ8oSLS7nj1lRjIYoW9faPuobOVPR80/5yvgAOXcAaiYZBI+m6vE5gRh8lVWT Iyd+jHS97X+EIei/OSiln7aaI3tTur4= X-MC-Unique: GcI-TyjHOh6z61olD8EhhA-1 From: Hanna Reitz To: qemu-block@nongnu.org Subject: [PATCH v3 1/3] iotests.py: Add supports_qcow2_zstd_compression() Date: Wed, 23 Mar 2022 11:55:20 +0100 Message-Id: <20220323105522.53660-2-hreitz@redhat.com> In-Reply-To: <20220323105522.53660-1-hreitz@redhat.com> References: <20220323105522.53660-1-hreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=hreitz@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=hreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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_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: , Cc: Thomas Huth , Kevin Wolf , Hanna Reitz , Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648033126001100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Suggested-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Hanna Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/iotests.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index fcec3e51e5..fe10a6cf05 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -1471,6 +1471,26 @@ def verify_working_luks(): if not working: notrun(reason) =20 +def supports_qcow2_zstd_compression() -> bool: + img_file =3D f'{test_dir}/qcow2-zstd-test.qcow2' + res =3D qemu_img('create', '-f', 'qcow2', '-o', 'compression_type=3Dzs= td', + img_file, '0', + check=3DFalse) + try: + os.remove(img_file) + except OSError: + pass + + if res.returncode =3D=3D 1 and \ + "'compression-type' does not accept value 'zstd'" in res.stdou= t: + return False + else: + return True + +def verify_qcow2_zstd_compression(): + if not supports_qcow2_zstd_compression(): + notrun('zstd compression not supported') + def qemu_pipe(*args: str) -> str: """ Run qemu with an option to print something and exit (e.g. a help optio= n). --=20 2.35.1 From nobody Wed May 15 10:22:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164803311796169.22480546585302; Wed, 23 Mar 2022 03:58:37 -0700 (PDT) Received: from localhost ([::1]:33220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWyhJ-0007AC-0e for importer@patchew.org; Wed, 23 Mar 2022 06:58:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWyeL-00043Q-8t for qemu-devel@nongnu.org; Wed, 23 Mar 2022 06:55:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:53089) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWyeI-00026u-Vd for qemu-devel@nongnu.org; Wed, 23 Mar 2022 06:55:32 -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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-14-EVdLlZt5MZa2BMwuK6zJHw-1; Wed, 23 Mar 2022 06:55:28 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D4D6D866DF8; Wed, 23 Mar 2022 10:55:27 +0000 (UTC) Received: from localhost (unknown [10.39.195.65]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8A793400F72A; Wed, 23 Mar 2022 10:55:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648032930; 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=MLRw/ypMBLIUO7Ubyf8p14rwt3IXObDz9fr79CRGGgw=; b=afd+6KbBm4leaSjDGaHT5SBzqmML1H7Y6LqNDcdlHqQyvIrgFE7Y7R+IshPk7j6XjkwMRt gNnkxxuG/ZIYi8+NQQ7xDGxIPsASWEVRyuIUk103HWqiwbN9XoqSq3RQRa9yyT1B8AD7qp +JsqqBkGVlGdeNqtHdFR45I8Ne6A+Jk= X-MC-Unique: EVdLlZt5MZa2BMwuK6zJHw-1 From: Hanna Reitz To: qemu-block@nongnu.org Subject: [PATCH v3 2/3] iotests/065: Check for zstd support Date: Wed, 23 Mar 2022 11:55:21 +0100 Message-Id: <20220323105522.53660-3-hreitz@redhat.com> In-Reply-To: <20220323105522.53660-1-hreitz@redhat.com> References: <20220323105522.53660-1-hreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=hreitz@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=hreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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_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: , Cc: Thomas Huth , Kevin Wolf , Hanna Reitz , Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648033119706100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Some test cases run in iotest 065 want to run with zstd compression just for added coverage. Run them with zlib if there is no zstd support compiled in. Reported-by: Thomas Huth Fixes: 12a936171d71f839dc907ff ("iotest 065: explicit compression type") Signed-off-by: Hanna Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/065 | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/tests/qemu-iotests/065 b/tests/qemu-iotests/065 index ba94e19349..b724c89c7c 100755 --- a/tests/qemu-iotests/065 +++ b/tests/qemu-iotests/065 @@ -24,7 +24,7 @@ import os import re import json import iotests -from iotests import qemu_img, qemu_img_info +from iotests import qemu_img, qemu_img_info, supports_qcow2_zstd_compressi= on import unittest =20 test_img =3D os.path.join(iotests.test_dir, 'test.img') @@ -95,11 +95,17 @@ class TestQCow2(TestQemuImgInfo): =20 class TestQCow3NotLazy(TestQemuImgInfo): '''Testing a qcow2 version 3 image with lazy refcounts disabled''' - img_options =3D 'compat=3D1.1,lazy_refcounts=3Doff,compression_type=3D= zstd' + if supports_qcow2_zstd_compression(): + compression_type =3D 'zstd' + else: + compression_type =3D 'zlib' + + img_options =3D 'compat=3D1.1,lazy_refcounts=3Doff' + img_options +=3D f',compression_type=3D{compression_type}' json_compare =3D { 'compat': '1.1', 'lazy-refcounts': False, 'refcount-bits': 16, 'corrupt': False, - 'compression-type': 'zstd', 'extended-l2': False } - human_compare =3D [ 'compat: 1.1', 'compression type: zstd', + 'compression-type': compression_type, 'extended-l2': = False } + human_compare =3D [ 'compat: 1.1', f'compression type: {compression_ty= pe}', 'lazy refcounts: false', 'refcount bits: 16', 'corrupt: false', 'extended l2: false' ] =20 @@ -126,11 +132,17 @@ class TestQCow3NotLazyQMP(TestQMP): class TestQCow3LazyQMP(TestQMP): '''Testing a qcow2 version 3 image with lazy refcounts enabled, opening with lazy refcounts disabled''' - img_options =3D 'compat=3D1.1,lazy_refcounts=3Don,compression_type=3Dz= std' + if supports_qcow2_zstd_compression(): + compression_type =3D 'zstd' + else: + compression_type =3D 'zlib' + + img_options =3D 'compat=3D1.1,lazy_refcounts=3Don' + img_options +=3D f',compression_type=3D{compression_type}' qemu_options =3D 'lazy-refcounts=3Doff' compare =3D { 'compat': '1.1', 'lazy-refcounts': True, 'refcount-bits': 16, 'corrupt': False, - 'compression-type': 'zstd', 'extended-l2': False } + 'compression-type': compression_type, 'extended-l2': False= } =20 TestImageInfoSpecific =3D None TestQemuImgInfo =3D None --=20 2.35.1 From nobody Wed May 15 10:22:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648033210110867.5776504198458; Wed, 23 Mar 2022 04:00:10 -0700 (PDT) Received: from localhost ([::1]:38320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWyim-00027u-Pl for importer@patchew.org; Wed, 23 Mar 2022 07:00:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWyeO-00044T-6s for qemu-devel@nongnu.org; Wed, 23 Mar 2022 06:55:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:28251) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWyeM-00027d-Qp for qemu-devel@nongnu.org; Wed, 23 Mar 2022 06:55:35 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-447-1mQ9-junMo2__tuXOs_m5Q-1; Wed, 23 Mar 2022 06:55:30 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A425D382054A; Wed, 23 Mar 2022 10:55:29 +0000 (UTC) Received: from localhost (unknown [10.39.195.65]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5C56B40D2823; Wed, 23 Mar 2022 10:55:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648032933; 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=WwIHZpkdTsSkXstcK0Ye4twQkdM4TafApr85+wPyYso=; b=coCRd33H63HUV5VfV3vQKuiA1JpUEs43O3AZXow965Iva8CrERfkqLQCbwGa+I1CUnok28 uIcCj6VewGksuJcWqKu4cikhrfIRgRUCrx8RIZvvmYh725jsLvt12KCstmR0BntxSwDJsI hu7p5YvMz8d3QKkOQVm+CjcLFWXfGlE= X-MC-Unique: 1mQ9-junMo2__tuXOs_m5Q-1 From: Hanna Reitz To: qemu-block@nongnu.org Subject: [PATCH v3 3/3] iotests/303: Check for zstd support Date: Wed, 23 Mar 2022 11:55:22 +0100 Message-Id: <20220323105522.53660-4-hreitz@redhat.com> In-Reply-To: <20220323105522.53660-1-hreitz@redhat.com> References: <20220323105522.53660-1-hreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=hreitz@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=hreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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: , Cc: Thomas Huth , Kevin Wolf , Hanna Reitz , Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648033210953100001 Content-Type: text/plain; charset="utf-8" 303 runs two test cases, one of which requires zstd support. Unfortunately, given that this is not a unittest-style test, we cannot easily skip that single case, and instead can only skip the whole test. (Alternatively, we could split this test into a zlib and a zstd part, but that seems excessive, given that this test is not in auto and thus likely only run by developers who have zstd support compiled in.) Fixes: 677e0bae686e7c670a71d1f ("iotest 303: explicit compression type") Signed-off-by: Hanna Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/303 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/303 b/tests/qemu-iotests/303 index 93aa5ce9b7..40e947f26c 100755 --- a/tests/qemu-iotests/303 +++ b/tests/qemu-iotests/303 @@ -21,10 +21,12 @@ =20 import iotests import subprocess -from iotests import qemu_img_create, qemu_io, file_path, log, filter_qemu_= io +from iotests import qemu_img_create, qemu_io, file_path, log, filter_qemu_= io, \ + verify_qcow2_zstd_compression =20 iotests.script_initialize(supported_fmts=3D['qcow2'], unsupported_imgopts=3D['refcount_bits', 'compat'= ]) +verify_qcow2_zstd_compression() =20 disk =3D file_path('disk') chunk =3D 1024 * 1024 --=20 2.35.1