From nobody Mon Feb 9 14:01:11 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=1577015606; cv=none; d=zohomail.com; s=zohoarc; b=eAF1ETE1gqFuMdX6XyRxcres2hHDMUAaV5GIwthVbi1VFbap5mmiCfqwxGEJ/zvYhDSXipKc/abeRAvqSo4KMP/By0ueKsBF7uDgKsfPwDycUXCr3rWcPhoGGA7oEu+Qj6xzO4AeyANpttYd/TMUTOP8xazdad173ODkcYMBAus= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577015606; 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=i05ULFbw66+cnut3ZhVJxSLNIOEckOUgveo/uLuVGKE=; b=jpzt3c5y0wThZFlEmBioEEl4TQ06gPuYV1A3YW3yv7ODijmjMIqEtoT8BAdJBNiA/Udn0oVlwCFvVVQkyXbFwqKfR+sn05WBhpvjZnimjPuv7Sg3JWWAHydy4hQzyA5NQ1pj/zfQjZQe1xoqsl8611YWCJiWrqXgO+vW6bF3WVs= 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 1577015606481161.46064156544105; Sun, 22 Dec 2019 03:53:26 -0800 (PST) Received: from localhost ([::1]:46892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iiznZ-0001zt-D6 for importer@patchew.org; Sun, 22 Dec 2019 06:53:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43692) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iizZ8-0003Ls-Vm for qemu-devel@nongnu.org; Sun, 22 Dec 2019 06:38:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iizZ7-0006o0-Me for qemu-devel@nongnu.org; Sun, 22 Dec 2019 06:38:30 -0500 Received: from fanzine.igalia.com ([178.60.130.6]:34967) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iizZ7-0004Un-9Q; Sun, 22 Dec 2019 06:38:29 -0500 Received: from [80.30.182.172] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1iizYU-0005dF-OV; Sun, 22 Dec 2019 12:37:51 +0100 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1iizXu-0001Vs-K3; Sun, 22 Dec 2019 12:37:14 +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=i05ULFbw66+cnut3ZhVJxSLNIOEckOUgveo/uLuVGKE=; b=dVnN2wMQWmCdO0Aok2hl/6IF2q27sfq7aRm48rqtg6Cjp1jmEcg2MSX+3aX2gPpJidbfbRI3XOq2sVa+hRWCY/qVGavottWpy9x9y3djcsnYcUnFa4/H1hJ/kBnHevLy6QY4X0bVneYnP9w7qHXaBiFdzcTBtVsH16aJrvBk6ZjsYB5Yidkaslb8axlXFl8bvFwU5xer4U9sS3s1dbtgasb70Pohl8qjASJnOB58zbw1pVntvIROUjCMJczOgQV9Wz+WV4Tmqnzjbn6R1gM8rETJQRUkmRTyYYP2ib+BZ7gRpNbCzFo6/yqHd6llIgKmYlxUzMqmGocQgomQ+js23Q==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [RFC PATCH v3 13/27] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC Date: Sun, 22 Dec 2019 12:36:54 +0100 Message-Id: <6b6c430112937f628d91fe085121c09d23dece24.1577014346.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 --- block/qcow2.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 9277d680ef..1d3da0ccf6 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1985,7 +1985,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 cluster_offset | offset_into_cluster(s, offset); *file =3D s->data_file->bs; status |=3D BDRV_BLOCK_OFFSET_VALID; @@ -1993,7 +1994,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); @@ -2236,7 +2239,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 { @@ -3750,6 +3754,7 @@ static coroutine_fn int qcow2_co_pwrite_zeroes(BlockD= riverState *bs, return -ENOTSUP; } if (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); @@ -3822,6 +3827,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