david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcow2: Return real error code in load_refcount_block

Browse Source 
This fixes load_refcount_block which completely ignored the return value of
write_refcount_block and always returned -EIO for bdrv_pwrite failure.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2010-06-04 11:27:08 +02:00
parent 2eaa8f6338
commit e14e8ba5d0
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
block/qcow2-refcount.c
View File

@ -93,14 +93,19 @@ static int load_refcount_block(BlockDriverState *bs,
int ret; int ret;
if (cache_refcount_updates) { if (cache_refcount_updates) {
write_refcount_block(bs); ret = write_refcount_block(bs);
if (ret < 0) {
return ret;
}
} }
BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_LOAD); BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_LOAD);
ret = bdrv_pread(bs->file, refcount_block_offset, s->refcount_block_cache, ret = bdrv_pread(bs->file, refcount_block_offset, s->refcount_block_cache,
s->cluster_size); s->cluster_size);
if (ret != s->cluster_size) if (ret < 0) {
return -EIO; return ret;
}
s->refcount_block_cache_offset = refcount_block_offset; s->refcount_block_cache_offset = refcount_block_offset;
return 0; return 0;
} }