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/qcow2.c | |
| parent | 4f5786376e41980e78af45a123c56ebdc5295099 (diff) | |
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/qcow2.c')
| -rw-r--r-- | block/qcow2.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 4d7bd78b94..cf03a14ae0 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -696,13 +696,11 @@ static int coroutine_fn qcow2_co_is_allocated(BlockDriverState *bs, int ret; *pnum = nb_sectors; - /* FIXME We can get errors here, but the bdrv_co_is_allocated interface - * can't pass them on today */ qemu_co_mutex_lock(&s->lock); ret = qcow2_get_cluster_offset(bs, sector_num << 9, pnum, &cluster_offset); qemu_co_mutex_unlock(&s->lock); if (ret < 0) { - *pnum = 0; + return ret; } return (cluster_offset != 0) || (ret == QCOW2_CLUSTER_ZERO); |