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:54:52 +0200
commit0434349d6ac96d26cf067f58074b939d881b0911 (patch)
tree0fb75cb156c35fc26cbba8dc642e33f16fd51505 /block
parentqcow2: Don't ignore immediate read/write failures (diff)
downloadqemu-kvm-0434349d6ac96d26cf067f58074b939d881b0911.tar.gz
qemu-kvm-0434349d6ac96d26cf067f58074b939d881b0911.tar.bz2
qemu-kvm-0434349d6ac96d26cf067f58074b939d881b0911.zip
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> (cherry picked from commit c644db3d53c90ef569ff5a90e9f821b88e7123bb)
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 b13b6935f..c7057b166 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 f6f8980ed..5d33d6c79 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -624,11 +624,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);