]> git.proxmox.com Git - qemu.git/commit
block: expect errors from bdrv_co_is_allocated
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 4 Sep 2013 17:00:25 +0000 (19:00 +0200)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Wed, 25 Sep 2013 01:59:51 +0000 (20:59 -0500)
commitda4e203efa76f2d2ee0a17670c241881963d033d
tree12b49ddd3694231ba82418e6683d82ee94da32d4
parentc09a4634d945df5d7e1fbc394646e78d7d713c67
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>
(cherry picked from commit d663640c04f2aab810915c556390211d75457704)

Conflicts:

block/cow.c

*modified to avoid dependency on upstream's e641c1e8

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
block.c
block/cow.c
block/qcow2.c
block/stream.c
qemu-img.c
qemu-io-cmds.c