vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
master
Kevin Wolf 2011-02-09 10:26:06 +01:00
parent 3ab4c7e92d
commit 8af3648843
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/qcow2-cluster.c
View File

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

4
block/qcow2.c
View File

@ -497,8 +497,10 @@ static void qcow2_aio_read_cb(void *opaque, int ret)
} }
} else if (acb->cluster_offset & QCOW_OFLAG_COMPRESSED) { } else if (acb->cluster_offset & QCOW_OFLAG_COMPRESSED) {
/* add AIO support for compressed blocks ? */ /* 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; goto done;
}
qemu_iovec_from_buffer(&acb->hd_qiov, qemu_iovec_from_buffer(&acb->hd_qiov,
s->cluster_cache + index_in_cluster * 512, s->cluster_cache + index_in_cluster * 512,