From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:51644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gz2wZ-0003kx-J0 for qemu-devel@nongnu.org; Wed, 27 Feb 2019 12:24:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gz2wY-0003ov-7D for qemu-devel@nongnu.org; Wed, 27 Feb 2019 12:24:31 -0500 From: Kevin Wolf Date: Wed, 27 Feb 2019 18:22:46 +0100 Message-Id: <20190227172256.30368-11-kwolf@redhat.com> In-Reply-To: <20190227172256.30368-1-kwolf@redhat.com> References: <20190227172256.30368-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 10/20] qcow2: Prepare qcow2_co_block_status() for data file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, eblake@redhat.com, qemu-devel@nongnu.org Offset 0 cannot be assumed to mean an unallocated cluster any more. Instead, the cluster type needs to be checked. *file must refer to the data file instead of the image file if a valid offset is returned from qcow2_co_block_status(). Signed-off-by: Kevin Wolf --- block/qcow2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 11ff5e0434..8dc6f21047 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1817,11 +1817,11 @@ static int coroutine_fn qcow2_co_block_status(Blo= ckDriverState *bs, =20 *pnum =3D bytes; =20 - if (cluster_offset !=3D 0 && ret !=3D QCOW2_CLUSTER_COMPRESSED && + if ((ret =3D=3D QCOW2_CLUSTER_NORMAL || ret =3D=3D QCOW2_CLUSTER_ZER= O_ALLOC) && !s->crypto) { index_in_cluster =3D offset & (s->cluster_size - 1); *map =3D cluster_offset | index_in_cluster; - *file =3D bs->file->bs; + *file =3D s->data_file->bs; status |=3D BDRV_BLOCK_OFFSET_VALID; } if (ret =3D=3D QCOW2_CLUSTER_ZERO_PLAIN || ret =3D=3D QCOW2_CLUSTER_= ZERO_ALLOC) { --=20 2.20.1