From nobody Mon Feb 9 08:49:25 2026 Delivered-To: importer@patchew.org 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; 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=1584469297; cv=none; d=zohomail.com; s=zohoarc; b=XnuP6HqjJtT0qGg47PTwioPunrntIRBJTeo3wRFbHUvp9+lE50407/KLf/BjUlt/z56DtCkW0yA80hy93J4Gem1PCmmyWnzGWXEjtdYUB/I73I0is60hi7aosXZFJTvXnVZHhknSyiSkV10aX68RABTugG+ela16JPy3glgqt5Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584469297; 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=jOIbxftiwi29Ma/CLOJsLFbSYwwFwEOm5EzACtLvpZQ=; b=Ah/hPUh2ezM4/Vv1t5y+g21odSS5rpoInr9J5uvf7YU+IWyHoajVRWaZm5RWZXR287OC1NFTIjBR3ICCtISkSSmZ/t+E1JaNbSZORZzmxr4ty9Rxte1BBk998WqsIk8CL5lYcRYcXe1lFVrLKfEBTGpVwk7Iv2e9O8++2qYO7dE= 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 1584469297599250.8110585920498; Tue, 17 Mar 2020 11:21:37 -0700 (PDT) Received: from localhost ([::1]:38988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEGqO-0008QL-Gd for importer@patchew.org; Tue, 17 Mar 2020 14:21:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48311) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEGma-0002oF-W7 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 14:17:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEGmZ-0007VK-1O for qemu-devel@nongnu.org; Tue, 17 Mar 2020 14:17:40 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:57767) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEGmX-0005Yd-Ap; Tue, 17 Mar 2020 14:17:38 -0400 Received: from [81.0.35.138] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1jEGmD-00014q-33; Tue, 17 Mar 2020 19:17:17 +0100 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1jEGlw-0006OZ-J9; Tue, 17 Mar 2020 19:17:00 +0100 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=jOIbxftiwi29Ma/CLOJsLFbSYwwFwEOm5EzACtLvpZQ=; b=dKHnLWYDw6smhGytUfXVQJ/TSGK4ZxJiv2MmDAhdVC6KeZeVlzEjhgyke0H1goeP9hNYk4Eyu3zddLjQ4m/VzwVSE9xGxuIjsqhxmfeYKhXDCi+Cn2e2AJVHVFbxMsfsPY4neQ9Wq6mtdRDLwx+3FV3BhfSRnN/6v6GJYzNhI+lcOUdnni3mSTKc5e8t2IxHB3jAHjea8Qf9LxyV/4XQyVXL6esPSsRKmi+cnulJL3sNGOPiZBibpe7t3uzU5zlw0Pf6guRd+XaZ7e9beK5Hmr4W+9AThUt7wTgR2Sm6tez2v/BlXLuAOzDI9g5hAUpHYbg7mMnRmkcErGAc5Vc8lQ==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [PATCH v4 16/30] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC Date: Tue, 17 Mar 2020 19:16:13 +0100 Message-Id: <8d7d7287935141177c6a6f92196acc638ea5225b.1584468723.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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 178.60.130.6 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 , Anton Nefedov , Alberto Garcia , qemu-block@nongnu.org, Max Reitz , Vladimir Sementsov-Ogievskiy , "Denis V . Lunev" 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" When dealing with subcluster types there is a new value called QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC that has no equivalent in QCow2ClusterType. This patch handles that value in all places where subcluster types are processed. Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/qcow2.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index f8788d6305..88daaf11a0 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1992,7 +1992,8 @@ static int coroutine_fn qcow2_co_block_status(BlockDr= iverState *bs, *pnum =3D bytes; =20 if ((type =3D=3D QCOW2_SUBCLUSTER_NORMAL || - type =3D=3D QCOW2_SUBCLUSTER_ZERO_ALLOC) && !s->crypto) { + type =3D=3D QCOW2_SUBCLUSTER_ZERO_ALLOC || + type =3D=3D QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC) && !s->crypto) { *map =3D host_offset; *file =3D s->data_file->bs; status |=3D BDRV_BLOCK_OFFSET_VALID; @@ -2000,7 +2001,8 @@ static int coroutine_fn qcow2_co_block_status(BlockDr= iverState *bs, if (type =3D=3D QCOW2_SUBCLUSTER_ZERO_PLAIN || type =3D=3D QCOW2_SUBCLUSTER_ZERO_ALLOC) { status |=3D BDRV_BLOCK_ZERO; - } else if (type !=3D QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN) { + } else if (type !=3D QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN && + type !=3D QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC) { status |=3D BDRV_BLOCK_DATA; } if (s->metadata_preallocation && (status & BDRV_BLOCK_DATA) && @@ -2163,6 +2165,7 @@ static coroutine_fn int qcow2_co_preadv_task(BlockDri= verState *bs, g_assert_not_reached(); =20 case QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN: + case QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC: assert(bs->backing); /* otherwise handled in qcow2_co_preadv_part = */ =20 BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO); @@ -2231,7 +2234,8 @@ static coroutine_fn int qcow2_co_preadv_part(BlockDri= verState *bs, =20 if (type =3D=3D QCOW2_SUBCLUSTER_ZERO_PLAIN || type =3D=3D QCOW2_SUBCLUSTER_ZERO_ALLOC || - (type =3D=3D QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN && !bs->backin= g)) + (type =3D=3D QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN && !bs->backin= g) || + (type =3D=3D QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC && !bs->backin= g)) { qemu_iovec_memset(qiov, qiov_offset, 0, cur_bytes); } else { @@ -3740,6 +3744,7 @@ static coroutine_fn int qcow2_co_pwrite_zeroes(BlockD= riverState *bs, ret =3D qcow2_get_host_offset(bs, offset, &nr, &off, &type); if (ret < 0 || (type !=3D QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN && + type !=3D QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC && type !=3D QCOW2_SUBCLUSTER_ZERO_PLAIN && type !=3D QCOW2_SUBCLUSTER_ZERO_ALLOC)) { qemu_co_mutex_unlock(&s->lock); @@ -3812,6 +3817,7 @@ qcow2_co_copy_range_from(BlockDriverState *bs, =20 switch (type) { case QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN: + case QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC: if (bs->backing && bs->backing->bs) { int64_t backing_length =3D bdrv_getlength(bs->backing->bs); if (src_offset >=3D backing_length) { --=20 2.20.1