From nobody Mon Feb 9 09:08:17 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1590332554; cv=none; d=zohomail.com; s=zohoarc; b=BjS/3u7+PIGNTntyduSXU1zihTGlwYYozROfKcWoATdgSA8GkNF1B657PeYlSip+peGX/l7pjP8o/IGXBY4g5AWwWMFt3840Jkx/ApWx/VDISOgvd/uRAoxQ/pAMdkSZIlit3w3CEqFb1u88kCK8KyBVicvpcxck+XiX2fwhKCE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590332554; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GICUrtzB9EXwnYWFxEan71TLpRmJfz2UVWyXq4cIUYg=; b=kLeFr1al+7FXjCCfvC/P4VAtjBvSt6uiOWnEu/mPqVj57AAFAC22yfgxsnfLfYVM/QgyMFawjiuO/q3VtQ23tAuM1yDd956/BVqiY/UmJamFf+VchUkQ96v83FdBcG9n1raQDRMSKZs0lYKMIQpN0MGG+YqN/7vbwQhpyOGGTPo= ARC-Authentication-Results: i=1; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590332554581517.171294991663; Sun, 24 May 2020 08:02:34 -0700 (PDT) Received: from localhost ([::1]:57758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcs93-0003jd-DM for importer@patchew.org; Sun, 24 May 2020 11:02:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcs00-0002zu-0i; Sun, 24 May 2020 10:53:12 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:38071) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcrzx-0002ls-Vw; Sun, 24 May 2020 10:53:11 -0400 Received: from [81.0.38.199] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1jcrzF-0007Gf-Rj; Sun, 24 May 2020 16:52:26 +0200 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1jcryv-0005Ky-Kc; Sun, 24 May 2020 16:52:05 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=GICUrtzB9EXwnYWFxEan71TLpRmJfz2UVWyXq4cIUYg=; b=qDmCQlGKUaeYUq7tFkvZKhuYmfvJpgyNP0hq3y0Apterm0pAOybIehN7bMX4BIAyl0MZ6ddwau+iZo5Y5hGL4GGkbST3s8fPtVuG3AUBByVrJVQv5jzdynkQXo0VbST+8wRTPWGuA3iCyxqdJeNxENW1th7AMDTPtpof6WMy3ypBsgbwfVFAYrqWfFh676l0WIozlQVXBry/8Wy0l2FH/8bE8/EEw02VnM7X6Ajs/rI1jpGSM658NvWbPjA+rot+QJe1fQsElRySYDVr31vLezNlIzYeY7sYf2eSkuc/2Zg9xS0IdySwjzTzyl3CUCB4vrZuewpKo1vypDp/8Sa6gw==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [PATCH v6 31/32] qcow2: Assert that expand_zero_clusters_in_l1() does not support subclusters Date: Sun, 24 May 2020 16:51:51 +0200 Message-Id: <5c074bc2198728cc7ca12418f90155a4ebf46d81.1590331741.git.berto@igalia.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 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=178.60.130.6; envelope-from=berto@igalia.com; helo=fanzine.igalia.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/24 10:52:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Vladimir Sementsov-Ogievskiy , Alberto Garcia , qemu-block@nongnu.org, Derek Su , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This function is only used by qcow2_expand_zero_clusters() to downgrade a qcow2 image to a previous version. It is however not possible to downgrade an image with extended L2 entries because older versions of qcow2 do not have this feature. Signed-off-by: Alberto Garcia Reviewed-by: Eric Blake --- block/qcow2-cluster.c | 8 +++++++- tests/qemu-iotests/061 | 6 ++++++ tests/qemu-iotests/061.out | 5 +++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index b808d6ad95..608e785dd6 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -2156,6 +2156,9 @@ static int expand_zero_clusters_in_l1(BlockDriverStat= e *bs, uint64_t *l1_table, int ret; int i, j; =20 + /* qcow2_downgrade() is not allowed in images with subclusters */ + assert(!has_subclusters(s)); + slice_size2 =3D s->l2_slice_size * l2_entry_size(s); n_slices =3D s->cluster_size / slice_size2; =20 @@ -2224,7 +2227,8 @@ static int expand_zero_clusters_in_l1(BlockDriverStat= e *bs, uint64_t *l1_table, if (cluster_type =3D=3D QCOW2_CLUSTER_ZERO_PLAIN) { if (!bs->backing) { /* not backed; therefore we can simply deallocate = the - * cluster */ + * cluster. No need to call set_l2_bitmap(), this + * function doesn't support images with subcluster= s. */ set_l2_entry(s, l2_slice, j, 0); l2_dirty =3D true; continue; @@ -2295,6 +2299,8 @@ static int expand_zero_clusters_in_l1(BlockDriverStat= e *bs, uint64_t *l1_table, } else { set_l2_entry(s, l2_slice, j, offset); } + /* No need to call set_l2_bitmap() after set_l2_entry() be= cause + * this function doesn't support images with subclusters. = */ l2_dirty =3D true; } =20 diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061 index 10eb243164..23add2dfe3 100755 --- a/tests/qemu-iotests/061 +++ b/tests/qemu-iotests/061 @@ -303,6 +303,12 @@ $QEMU_IMG amend -o "compat=3D0.10" "$TEST_IMG" _img_info --format-specific _check_test_img =20 +echo +echo "=3D=3D=3D Testing version downgrade with extended L2 entries =3D=3D= =3D" +echo +_make_test_img -o "compat=3D1.1,extended_l2=3Don" 64M +$QEMU_IMG amend -o "compat=3D0.10" "$TEST_IMG" + echo echo "=3D=3D=3D Try changing the external data file =3D=3D=3D" echo diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out index 39812d8cf8..c1acdbd751 100644 --- a/tests/qemu-iotests/061.out +++ b/tests/qemu-iotests/061.out @@ -528,6 +528,11 @@ Format specific information: extended l2: false No errors were found on the image. =20 +=3D=3D=3D Testing version downgrade with extended L2 entries =3D=3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 +qemu-img: Cannot downgrade an image with incompatible features 0x10 set + =3D=3D=3D Try changing the external data file =3D=3D=3D =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 --=20 2.20.1