Commit 8af36488 authored Feb 09, 2011 by Kevin Wolf

qcow2: Fix error handling for reading compressed clusters



When reading a compressed cluster failed, qcow2 falsely returned success.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>

parent 3ab4c7e9

block/qcow2-cluster.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -878,11 +878,11 @@ int qcow2_decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset)
		BLKDBG_EVENT(bs->file, BLKDBG_READ_COMPRESSED);
		ret = bdrv_read(bs->file, coffset >> 9, s->cluster_data, nb_csectors);
		if (ret < 0) {
		return -1;
		return ret;
		}
		if (decompress_buffer(s->cluster_cache, s->cluster_size,
		s->cluster_data + sector_offset, csize) < 0) {
		return -1;
		return -EIO;
		}
		s->cluster_cache_offset = coffset;
		}

block/qcow2.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -497,8 +497,10 @@ static void qcow2_aio_read_cb(void *opaque, int ret)
		}
		} else if (acb->cluster_offset & QCOW_OFLAG_COMPRESSED) {
		/* add AIO support for compressed blocks ? */
		if (qcow2_decompress_cluster(bs, acb->cluster_offset) < 0)
		ret = qcow2_decompress_cluster(bs, acb->cluster_offset);
		if (ret < 0) {
		goto done;
		}

		qemu_iovec_from_buffer(&acb->hd_qiov,
		s->cluster_cache + index_in_cluster * 512,