[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/17] block: expect errors from bdrv_co_is_alloc
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 06/17] block: expect errors from bdrv_co_is_allocated |
Date: |
Tue, 16 Jul 2013 18:29:17 +0200 |
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: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>
---
v1->v2: modify error message, add strerror(-ret)
block/qcow2.c | 4 +---
block/stream.c | 2 +-
qemu-img.c | 5 +++++
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 0eceefe..e2b4202 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -648,13 +648,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);
diff --git a/block/stream.c b/block/stream.c
index 802acae..28b702d 100644
--- a/block/stream.c
+++ b/block/stream.c
@@ -120,7 +120,7 @@ wait:
if (ret == 1) {
/* Allocated in the top, no need to copy. */
copy = false;
- } else {
+ } else if (ret >= 0) {
/* Copy if allocated in the intermediate images. Limit to the
* known-unallocated area [sector_num, sector_num+n). */
ret = bdrv_is_allocated_above(bs->backing_hd, base,
diff --git a/qemu-img.c b/qemu-img.c
index c55ca5c..a4957eb 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2073,6 +2073,11 @@ static int img_rebase(int argc, char **argv)
/* If the cluster is allocated, we don't need to take action */
ret = bdrv_is_allocated(bs, sector, n, &n);
+ if (ret < 0) {
+ error_report("error while reading image metadata: %s",
+ strerror(-ret));
+ goto out;
+ }
if (ret) {
continue;
}
--
1.8.3.1
- [Qemu-devel] [PATCH v2 14/17] raw-posix: return get_block_status data and flags, (continued)
- [Qemu-devel] [PATCH v2 14/17] raw-posix: return get_block_status data and flags, Paolo Bonzini, 2013/07/16
- [Qemu-devel] [PATCH v2 15/17] raw-posix: detect XFS unwritten extents, Paolo Bonzini, 2013/07/16
- [Qemu-devel] [PATCH v2 16/17] block: add default get_block_status implementation for protocols, Paolo Bonzini, 2013/07/16
- [Qemu-devel] [PATCH v2 17/17] block: look for zero blocks in bs->file, Paolo Bonzini, 2013/07/16
- [Qemu-devel] [PATCH v2 06/17] block: expect errors from bdrv_co_is_allocated,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 07/17] qemu-img: always probe the input image for allocated sectors, Paolo Bonzini, 2013/07/16
- [Qemu-devel] [PATCH v2 05/17] block: remove bdrv_is_allocated_above/bdrv_co_is_allocated_above distinction, Paolo Bonzini, 2013/07/16
- Re: [Qemu-devel] [PATCH v2 00/17] Add qemu-img subcommand to dump file metadata, Eric Blake, 2013/07/16