diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-09-04 19:00:25 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2013-09-06 15:25:09 +0200 |
| commit | d663640c04f2aab810915c556390211d75457704 (patch) | |
| tree | e255e24307c7889d516fc74c0416b6084c4d90f8 /block.c | |
| parent | 4f5786376e41980e78af45a123c56ebdc5295099 (diff) | |
| download | focaccia-qemu-d663640c04f2aab810915c556390211d75457704.tar.gz focaccia-qemu-d663640c04f2aab810915c556390211d75457704.zip | |
block: expect errors from bdrv_co_is_allocated
Some bdrv_is_allocated callers do not expect errors, but the fallback in qcow2.c might make other callers trip on assertion failures or infinite loops. Fix the callers to always look for errors. Cc: qemu-stable@nongnu.org Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block.c')
| -rw-r--r-- | block.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/block.c b/block.c index c6404ebbf8..5df17de5a4 100644 --- a/block.c +++ b/block.c @@ -1857,8 +1857,11 @@ int bdrv_commit(BlockDriverState *bs) buf = g_malloc(COMMIT_BUF_SECTORS * BDRV_SECTOR_SIZE); for (sector = 0; sector < total_sectors; sector += n) { - if (bdrv_is_allocated(bs, sector, COMMIT_BUF_SECTORS, &n)) { - + ret = bdrv_is_allocated(bs, sector, COMMIT_BUF_SECTORS, &n); + if (ret < 0) { + goto ro_cleanup; + } + if (ret) { if (bdrv_read(bs, sector, buf, n) != 0) { ret = -EIO; goto ro_cleanup; |