From nobody Sun Feb 8 14:52:00 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 17095868392321002.088941951679; Mon, 4 Mar 2024 13:13:59 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id EF7C719ED; Mon, 4 Mar 2024 16:13:57 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 221E319E2; Mon, 4 Mar 2024 16:07:25 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id E6A2C19CB; Mon, 4 Mar 2024 15:22:54 -0500 (EST) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D14A318A1 for ; Mon, 4 Mar 2024 15:22:53 -0500 (EST) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6e5c81ccfb9so2262677b3a.3 for ; Mon, 04 Mar 2024 12:22:53 -0800 (PST) Received: from iuseotherswifi.notpua ([218.185.248.66]) by smtp.gmail.com with ESMTPSA id j8-20020a62e908000000b006e48e64ef54sm3172585pfh.173.2024.03.04.12.22.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 12:22:51 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709583772; x=1710188572; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AyJ3XCaA+7c/BlfYVwqGfcAel7fBRZGiZAF+gxEq+Bo=; b=kM+3tUczLw07lpwmHQC6PCPWLJMSBoSfVFHdbZkkSNtRtpz5GW00U1oXs74Sj+tK4B WOi8pW1GXUvDzNpLBGjTADraR9vleg1W33PmEg3Zip7Q135DxLYjBOLONYTS3Vsz9zDz IrDR4gba4k0iT8FJFAFHupm5CVoYUK0HpTtjgxZrRMwOr6ugyhLzJz8m+0+mDkQkJ2fa SKGUi/UTtts8Qj19qs8oBZqWmRPFDHEJj87o/2mFkEJOzceJx9y0jl/SgGsv6RLFOvJG Jk81YoNrcD7YpH12Zb8bVAwtoz9TLMfAy54UPoCQUVOWe8hvFNhWGfzQeMJpZ+b70ZxK SZ5A== X-Gm-Message-State: AOJu0Yx8nHboxdRG+ZRUy0IP0w6dTfNwXn2mjLfDfgvy9dJLEQjyKANx 1bKltAkab456OJHh52zVE5ybswu4E9IEWXWt8492iKss/8gr7hcQCHyRee2fzuqm9A== X-Google-Smtp-Source: AGHT+IGTVxXjHXWkqMEJEp870Gnp2kh/Y15Ak4K5N2YIuWCl0PKq0x3Q3jHA60SqG8AwjUVKNPynbQ== X-Received: by 2002:a05:6a00:93a8:b0:6e6:380e:3db6 with SMTP id ka40-20020a056a0093a800b006e6380e3db6mr464548pfb.3.1709583771542; Mon, 04 Mar 2024 12:22:51 -0800 (PST) From: Abhiram Tilak To: devel@lists.libvirt.org Subject: [PATCH 2/2] storage: fix testcases on changing the default qcow2 compat to 1.1 Date: Tue, 5 Mar 2024 01:50:34 +0530 Message-ID: <20240304202031.22738-6-atp.exp@gmail.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240304202031.22738-2-atp.exp@gmail.com> References: <20240304202031.22738-2-atp.exp@gmail.com> MIME-Version: 1.0 X-MailFrom: atp.exp@gmail.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 Message-ID-Hash: Y7FSJZHSZ5VHIEWC4EFQPHAPGT3TOQVJ X-Message-ID-Hash: Y7FSJZHSZ5VHIEWC4EFQPHAPGT3TOQVJ X-Mailman-Approved-At: Mon, 04 Mar 2024 21:07:03 -0500 CC: jtomko@redhat.com, mprivozn@redhat.com, Abhiram Tilak X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1709586841176100001 After changing the default qcow2 image to 1.1 from 0.10. Some of the testcases in `storagevolxml2` here need fixing. This patch changes the expected compat version in each of these files that call qemu-img. As per qemu's Qcow docs the qemu-img command gives a 1.1 compatible version image. These testcases are written for 0.10, and should be upgraded. Also there is a testcase `qcow2-1.1.argv`. Which is aimed at testing 1.1 version specifically, I think a new testcase should be made to replace it called `qcow2-0.10.argv`. This requires renaming test files and changes at many places, not sure so didn't include in the patch. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/602 Signed-off-by: Abhiram Tilak --- .../storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv | 2 +- tests/storagevolxml2argvdata/qcow2-compat.argv | 2 +- tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv | 2 +- tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv | 2 +- .../qcow2-luks-convert-encrypt2fileqcow2.argv | 2 +- tests/storagevolxml2argvdata/qcow2-luks.argv | 2 +- .../qcow2-nobacking-convert-prealloc-compat.argv | 2 +- .../storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv | 2 +- .../qcow2-nocapacity-convert-prealloc.argv | 2 +- tests/storagevolxml2argvdata/qcow2-nocapacity.argv | 2 +- tests/storagevolxml2argvdata/qcow2-nocow-compat.argv | 2 +- tests/storagevolxml2argvdata/qcow2-zerocapacity.argv | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.ar= gv b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv index 4b9ccfe8dc..705604b162 100644 --- a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv +++ b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv @@ -1,7 +1,7 @@ qemu-img \ create \ -f qcow2 \ --o compat=3D0.10 \ +-o compat=3D1.1 \ /var/lib/libvirt/images/sparse-qcow2.img \ 1073741824K qemu-img \ diff --git a/tests/storagevolxml2argvdata/qcow2-compat.argv b/tests/storage= volxml2argvdata/qcow2-compat.argv index bf3a50a7f3..40fbe065e0 100644 --- a/tests/storagevolxml2argvdata/qcow2-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-compat.argv @@ -2,6 +2,6 @@ qemu-img \ create \ -f qcow2 \ -b /dev/null \ --o backing_fmt=3Draw,compat=3D0.10 \ +-o backing_fmt=3Draw,compat=3D1.1 \ /var/lib/libvirt/images/OtherDemo.img \ 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv b/= tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv index dbc7deb16a..b68da425d9 100644 --- a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv @@ -2,6 +2,6 @@ qemu-img \ convert \ -f raw \ -O qcow2 \ --o compat=3D0.10 \ +-o compat=3D1.1 \ /dev/HostVG/Swap \ /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv b= /tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv index d89622d4a6..3068b4b38d 100644 --- a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv +++ b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv @@ -2,7 +2,7 @@ qemu-img \ create \ -f qcow2 \ --object secret,id=3DOtherDemoLuks.img_encrypt0,file=3D/path/to/secretFile= \ --o encrypt.format=3Dluks,encrypt.key-secret=3DOtherDemoLuks.img_encrypt0,c= ompat=3D0.10 \ +-o encrypt.format=3Dluks,encrypt.key-secret=3DOtherDemoLuks.img_encrypt0,c= ompat=3D1.1 \ /var/lib/libvirt/images/OtherDemoLuks.img \ 5242880K qemu-img \ diff --git a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqc= ow2.argv b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow= 2.argv index 4d910552d0..948e9ac66d 100644 --- a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow2.argv +++ b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow2.argv @@ -1,7 +1,7 @@ qemu-img \ create \ -f qcow2 \ --o compat=3D0.10 \ +-o compat=3D1.1 \ /var/lib/libvirt/images/sparse-qcow2.img \ 1073741824K qemu-img \ diff --git a/tests/storagevolxml2argvdata/qcow2-luks.argv b/tests/storagevo= lxml2argvdata/qcow2-luks.argv index 308316c90c..a3be41a406 100644 --- a/tests/storagevolxml2argvdata/qcow2-luks.argv +++ b/tests/storagevolxml2argvdata/qcow2-luks.argv @@ -3,6 +3,6 @@ create \ -f qcow2 \ -b /dev/null \ --object secret,id=3DOtherDemoLuks.img_encrypt0,file=3D/path/to/secretFile= \ --o backing_fmt=3Draw,encrypt.format=3Dluks,encrypt.key-secret=3DOtherDemoL= uks.img_encrypt0,compat=3D0.10 \ +-o backing_fmt=3Draw,encrypt.format=3Dluks,encrypt.key-secret=3DOtherDemoL= uks.img_encrypt0,compat=3D1.1 \ /var/lib/libvirt/images/OtherDemoLuks.img \ 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-= compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc= -compat.argv index 463ae26779..a130ed8894 100644 --- a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.= argv +++ b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.= argv @@ -2,6 +2,6 @@ qemu-img \ convert \ -f raw \ -O qcow2 \ --o preallocation=3Dmetadata,compat=3D0.10 \ +-o preallocation=3Dmetadata,compat=3D1.1 \ /var/lib/libvirt/images/sparse.img \ /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.a= rgv b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv index 510e0c13f6..440ad8f122 100644 --- a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv @@ -1,6 +1,6 @@ qemu-img \ create \ -f qcow2 \ --o preallocation=3Dmetadata,compat=3D0.10 \ +-o preallocation=3Dmetadata,compat=3D1.1 \ /var/lib/libvirt/images/OtherDemo.img \ 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc= .argv b/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv index 0152b1efb6..3bf8613d72 100644 --- a/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv +++ b/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv @@ -2,6 +2,6 @@ qemu-img \ convert \ -f raw \ -O qcow2 \ --o preallocation=3Dfalloc,compat=3D0.10 \ +-o preallocation=3Dfalloc,compat=3D1.1 \ /var/lib/libvirt/images/sparse.img \ /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nocapacity.argv b/tests/sto= ragevolxml2argvdata/qcow2-nocapacity.argv index 047932a559..924c5c6084 100644 --- a/tests/storagevolxml2argvdata/qcow2-nocapacity.argv +++ b/tests/storagevolxml2argvdata/qcow2-nocapacity.argv @@ -2,5 +2,5 @@ qemu-img \ create \ -f qcow2 \ -b /dev/null \ --o backing_fmt=3Draw,compat=3D0.10 \ +-o backing_fmt=3Draw,compat=3D1.1 \ /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv b/tests/s= toragevolxml2argvdata/qcow2-nocow-compat.argv index 4cc7904cfc..ae94e4e588 100644 --- a/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv @@ -2,6 +2,6 @@ qemu-img \ create \ -f qcow2 \ -b /dev/null \ --o backing_fmt=3Draw,nocow=3Don,compat=3D0.10 \ +-o backing_fmt=3Draw,nocow=3Don,compat=3D1.1 \ /var/lib/libvirt/images/OtherDemo.img \ 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv b/tests/s= toragevolxml2argvdata/qcow2-zerocapacity.argv index 607c642e6f..05e31509cb 100644 --- a/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv +++ b/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv @@ -1,6 +1,6 @@ qemu-img \ create \ -f qcow2 \ --o compat=3D0.10 \ +-o compat=3D1.1 \ /var/lib/libvirt/images/OtherDemo.img \ 0K --=20 2.42.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org