aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2010-04-06 15:30:14 +0200
committerAurelien Jarno <aurelien@aurel32.net>2010-04-10 01:25:30 +0200
commitc644db3d53c90ef569ff5a90e9f821b88e7123bb (patch)
tree52e9d31619a5cf48ce50e174d301ea1a5d93357e /block
parent171e3d6b9997c98a97d0c525867f7cd9b640cadd (diff)
qcow2: Remove request from in-flight list after error
If we complete a request with a failure we need to remove it from the list of requests that are in flight. If we don't do it, the next time the same AIOCB is used for a cluster allocation it will create a loop in the list and qemu will hang in an endless loop. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'block')
-rw-r--r--block/qcow2-cluster.c1
-rw-r--r--block/qcow2.c6
2 files changed, 6 insertions, 1 deletions
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index b13b6935f8..c7057b1664 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -811,6 +811,7 @@ int qcow2_alloc_cluster_offset(BlockDriverState *bs, uint64_t offset,
cluster_offset = qcow2_alloc_clusters(bs, nb_clusters * s->cluster_size);
if (cluster_offset < 0) {
+ QLIST_REMOVE(m, next_in_flight);
return cluster_offset;
}
diff --git a/block/qcow2.c b/block/qcow2.c
index b44a12cdeb..4e97eb605d 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -625,11 +625,15 @@ static void qcow_aio_write_cb(void *opaque, int ret)
qcow_aio_write_cb, acb);
if (acb->hd_aiocb == NULL) {
ret = -EIO;
- goto done;
+ goto fail;
}
return;
+fail:
+ if (acb->l2meta.nb_clusters != 0) {
+ QLIST_REMOVE(&acb->l2meta, next_in_flight);
+ }
done:
if (acb->qiov->niov > 1)
qemu_vfree(acb->orig_buf);