diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2011-02-09 10:26:06 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-02-11 14:33:58 +0100 |
| commit | 5c9596112cbc959a0bbb458540a620ac05ece1a7 (patch) | |
| tree | bc7462cf7cab21160f101fcbd0cf1375e88abc39 | |
| parent | 16e07bc282c3c2d560ae9c4e9db76106975495eb (diff) | |
| download | qemu-5c9596112cbc959a0bbb458540a620ac05ece1a7.tar.gz | |
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>
(cherry picked from commit 8af364884355b3f0c5d60a2d2f427927739658ea)
| -rw-r--r-- | block/qcow2-cluster.c | 4 | ||||
| -rw-r--r-- | block/qcow2.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 5fb8c6695a..437aaa8174 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -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; } diff --git a/block/qcow2.c b/block/qcow2.c index 647c2a4bc4..551b3c2f82 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -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, |