From nobody Sun May 12 21:26:39 2024 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 1709668743341601.5733283376403; Tue, 5 Mar 2024 11:59:03 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 445F61C56; Tue, 5 Mar 2024 14:59:02 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C2F3E1BB5; Tue, 5 Mar 2024 14:54:39 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8285E18C1; Tue, 5 Mar 2024 07:53:36 -0500 (EST) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 2AB7B1909 for ; Tue, 5 Mar 2024 07:53:35 -0500 (EST) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6e64261e712so291149b3a.3 for ; Tue, 05 Mar 2024 04:53:35 -0800 (PST) Received: from iuseotherswifi.notpua ([218.185.248.66]) by smtp.gmail.com with ESMTPSA id r19-20020aa78453000000b006e4dad633e1sm9141566pfn.177.2024.03.05.04.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 04:53:32 -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=1709643213; x=1710248013; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=t6kIoW9AoqqJv8pUa/cHUkF0ZKhdG6VXw2JjPAibYZc=; b=h9Yu57QTDHLM+nWa8jVKv4S7vM7Pq2Xg6TAy7fX2bo2UzibjZJF1207mfskp93NeAf DQRbPN3XvDkjvWAAFFqBvHcNq7Sdixda3zCTl87u38Mf8ivwe9yZ32XZ2LwyvkTyGR+m JA76csCd8UclI4P1oLMKB2jUhNLVsPo2UZ00loK98tSTWkdqKO9pz4FPNOH5htbEJG5v DKakYwtgCkM4PBOPAnKNrMW64djqsKTHteGb2VDpyY4OnPpWnSG3+Eysf8mGSWT6W7l5 XnC6Cug/jn3BoDgGf9wlIJbtjHqhf2dPMNK+l05v8KMNltUTKCCPJ87qWuAbHBN+HrpE dTRA== X-Gm-Message-State: AOJu0YyeBHcPRrMDNfyiaQ7gqraNfrkyZ4XKnlvJQOojeEhHjeYK+FwH LAscUqKaXUyuY2HjmETDboKFpx5JCX9a44K/plZRH1AGyIuwZ/F9/Fr6Tc+nSD1RDw== X-Google-Smtp-Source: AGHT+IG4+9SiVQWwMd8KZnUv5mT1npVNa/Vz7uFEKypGL64OVR18URne6RjE8+jBPyNacR1+SMqBtQ== X-Received: by 2002:a05:6a20:244c:b0:1a1:4d40:6d09 with SMTP id t12-20020a056a20244c00b001a14d406d09mr1816810pzc.36.1709643213195; Tue, 05 Mar 2024 04:53:33 -0800 (PST) From: Abhiram Tilak To: devel@lists.libvirt.org Subject: [PATCH v2] storage: Upgrade default qcow2 version Date: Tue, 5 Mar 2024 18:22:17 +0530 Message-ID: <20240305125216.2653-2-atp.exp@gmail.com> X-Mailer: git-send-email 2.42.1 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: CETEZZHEQ2BT73ICKOUFN26GM2NCYBO4 X-Message-ID-Hash: CETEZZHEQ2BT73ICKOUFN26GM2NCYBO4 X-Mailman-Approved-At: Tue, 05 Mar 2024 19:54:33 -0500 CC: Abhiram Tilak , Peter Krempa 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: 1709668744265100001 Change the default to modern qcow2 as it's supported by all qemu versions supported by libvirt and `qemu-img` already defaults to the new format since QEMU 1.7. Some Unittests require changes to pass, now that version 1.1 is default. Unittests like `qcow2-1.1.argv` may not be relevant anymore, but this patch doesn't affect them. Signed-off-by: Abhiram Tilak Reviewed-by: Peter Krempa --- src/storage/storage_util.c | 2 +- .../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 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 7bf815d978..28d5fce4f0 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -765,7 +765,7 @@ storageBackendCreateQemuImgOpts(virStorageEncryptionInf= oDef *encinfo, if (info->compat) virBufferAsprintf(&buf, "compat=3D%s,", info->compat); else if (info->format =3D=3D VIR_STORAGE_FILE_QCOW2) - virBufferAddLit(&buf, "compat=3D0.10,"); + virBufferAddLit(&buf, "compat=3D1.1,"); if (info->clusterSize > 0) virBufferAsprintf(&buf, "cluster_size=3D%llu,", info->clusterSize); 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 -- 2.42.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org