From nobody Sun Feb 8 19:43:15 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=1593342636; cv=none; d=zohomail.com; s=zohoarc; b=h0vdjMcGvHckoMzohnRQkDWDSyvawFsNqxpglMKLWwj6Py3c8OyRCQ8AVeVP5oYGxvHwDGZ6Y6nts/SJw2csYk53bwCAKjLvIbc5T/4Qu94BEv0gbiLUlyPACJtput1XrjgFW7dVW9+7kbGAPdXdQyEwxENhWYFUesj0BJH3D3g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593342636; 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=JEa0mBV8UvnDyp5H8sfvCfcFuf5ZD0l+4WnlR2HdDiw=; b=Z+SaNBno/pnwwLPNBXnuAFhQnjgn/R//6o6vN9zZMDbB1Fnw7QlRalvGFnXqodtTePjsvX8TYY6qdTDYc4PteCZy+epsNxNZ6FHw4jswOOnpv/tKIkVEJmbtHm7mpG6KUpg1gnw83lJDO6ERV5Sdh+tVkTcqb6Jd1XEbKQ/uv5g= 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 15933426367521013.5040469788916; Sun, 28 Jun 2020 04:10:36 -0700 (PDT) Received: from localhost ([::1]:37654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpVCl-00016a-Cc for importer@patchew.org; Sun, 28 Jun 2020 07:10:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpV6O-0007Oa-WD; Sun, 28 Jun 2020 07:04:01 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:42339) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jpV6J-0000X9-9t; Sun, 28 Jun 2020 07:04:00 -0400 Received: from 26.red-79-158-236.dynamicip.rima-tde.net ([79.158.236.26] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1jpV5Y-0002gf-6Y; Sun, 28 Jun 2020 13:03:09 +0200 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1jpV5I-00038j-1N; Sun, 28 Jun 2020 13:02:52 +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=JEa0mBV8UvnDyp5H8sfvCfcFuf5ZD0l+4WnlR2HdDiw=; b=HYO1DwDWI9/BcpLvCFhlw23z0zZghXW34SqvfsdoVmV3/2+go/ca9JyVl05IcE4WEMpAQOsEnsniEkYF4y+NmRXUgK/T2p3MH3Lw6ykYDqRoE8Hk2TPMuWYo4q1E41YTAGaNgh48+woQyISYQFgITgR9HeAtZ0GFlU8yZ5nUIC3AA4qYpKIW7QibpKQh3AtWHMBb/q1BHV3JBDQVEMNNNtMXJU9HByUOdAOFUKjcl1XYCpnKm5FPDUXVx02rRohQQGi6kzWegRKjZuT+9h7lmq61cmBRzUsqk7Hrp5oXlje5urHq1FawPRIR94XbmeWsUTJO/VhnJgJ3c1EB10iDnw==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [PATCH v9 19/34] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC Date: Sun, 28 Jun 2020 13:02:28 +0200 Message-Id: <220b64fa73ba1ab4eb94f2a68cd4df79e5a5cdd8.1593342067.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/06/28 07:03:08 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_HELO_NONE=0.001, 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" 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 2f7a2a7c7a..a3481cd85b 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2054,7 +2054,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; @@ -2062,7 +2063,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) && @@ -2225,6 +2227,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); @@ -2293,7 +2296,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 { @@ -3865,6 +3869,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); @@ -3943,6 +3948,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