From nobody Mon Apr 14 15:45:35 2025
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;
dmarc=fail(p=none dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1598344727; cv=none;
d=zohomail.com; s=zohoarc;
b=Psqib30BdVyW+CLyp6ywqgpV4WTvK3YWC3BsO8m45iQMTIgVVKej09O16f3S0DveHSI0/JacbRmYk9jBIMoQz/9/qF7L/CEL1hMaR/EpEDyOyOd1NQOMahTDKM9oFSHqqo9m22nxgVVb1ww29wCCxeq+aCy+EbrX09WcgtIvkOU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1598344727;
h=Content-Type: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=MTOaFHyW4nS8jttGhp8QTuTPfR1MsxJzQ3YMNPrnEqc=;
b=jSAkZQ/SgPFLSvumjFQuRQBJGGluEdz8gfKykN9Wif1MJfEpXPoNK7vXPIEHw5sPeBSnoYqAjzT2AYHyJxXAWuCnXdCE9xFvuZ7FwvQP0IEI1oFxtpHWBPSyipBz1nkbZDIBiT9LoXvmNQgqtK/EBTcTB5nd00bG6S9KPABPXeQ=
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;
dmarc=fail header.from=<mreitz@redhat.com> (p=none dis=none)
header.from=<mreitz@redhat.com>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1598344727198346.18002236859456;
Tue, 25 Aug 2020 01:38:47 -0700 (PDT)
Received: from localhost ([::1]:60422 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1kAUTd-0004lz-W5
for importer@patchew.org; Tue, 25 Aug 2020 04:38:46 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:60414)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <mreitz@redhat.com>) id 1kAUP9-0004a7-7k
for qemu-devel@nongnu.org; Tue, 25 Aug 2020 04:34:07 -0400
Received: from us-smtp-1.mimecast.com ([207.211.31.81]:58213)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256)
(Exim 4.90_1) (envelope-from <mreitz@redhat.com>) id 1kAUP4-0000fH-2D
for qemu-devel@nongnu.org; Tue, 25 Aug 2020 04:34:06 -0400
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-7-5hPE7rS_OgSHAh_mxGtfXw-1; Tue, 25 Aug 2020 04:33:58 -0400
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DCBDF81F01D;
Tue, 25 Aug 2020 08:33:57 +0000 (UTC)
Received: from localhost (ovpn-113-72.ams2.redhat.com [10.36.113.72])
by smtp.corp.redhat.com (Postfix) with ESMTPS id 0527F6198D;
Tue, 25 Aug 2020 08:33:56 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1598344441;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=MTOaFHyW4nS8jttGhp8QTuTPfR1MsxJzQ3YMNPrnEqc=;
b=JftIhd8klaiJ4zgUT8wj24vIQ546khtdSvNq795IUblQ/sXqssa4dd9Odo4gsh6izCLJa6
qtJwuLnY2ACvcQiQAKV4YhfLkSWlK0FFG7IgXyqNm2GSQJcpDuh/rGA2BlONc1O5Sz23Z7
++xJqbW/Nhj5HiuirO8bGWblmaZlVUU=
X-MC-Unique: 5hPE7rS_OgSHAh_mxGtfXw-1
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Subject: [PULL 19/34] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC
Date: Tue, 25 Aug 2020 10:32:56 +0200
Message-Id: <20200825083311.1098442-20-mreitz@redhat.com>
In-Reply-To: <20200825083311.1098442-1-mreitz@redhat.com>
References: <20200825083311.1098442-1-mreitz@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
Authentication-Results: relay.mimecast.com;
auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com
X-Mimecast-Spam-Score: 0.001
X-Mimecast-Originator: redhat.com
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=207.211.31.81; envelope-from=mreitz@redhat.com;
helo=us-smtp-1.mimecast.com
X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 01:36:47
X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy]
X-Spam_score_int: -30
X-Spam_score: -3.1
X-Spam_bar: ---
X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.956,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: Kevin Wolf <kwolf@redhat.com>, Peter Maydell <peter.maydell@linaro.org>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
Content-Type: text/plain; charset="utf-8"
From: Alberto Garcia <berto@igalia.com>
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 <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <bf09e2e2439a468a901bb96ace411eed9ee50295.1594396418.git.berto@=
igalia.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
block/qcow2.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 477d60dd71..60192f1be3 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -2064,7 +2064,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;
@@ -2072,7 +2073,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) &&
@@ -2235,6 +2237,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);
@@ -2303,7 +2306,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 {
@@ -3858,6 +3862,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);
@@ -3936,6 +3941,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.26.2