commit c644db3d53c90ef569ff5a90e9f821b88e7123bb
author Kevin Wolf <kwolf@redhat.com> Tue Apr 06 15:30:14 2010 +0200
committer Aurelien Jarno <aurelien@aurel32.net> Sat Apr 10 01:25:30 2010 +0200
tree 52e9d31619a5cf48ce50e174d301ea1a5d93357e
parent 171e3d6b9997c98a97d0c525867f7cd9b640cadd

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>

block/qcow2-cluster.c

diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index b13b693..c7057b1 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -811,6 +811,7 @@
 
     cluster_offset = qcow2_alloc_clusters(bs, nb_clusters * s->cluster_size);
     if (cluster_offset < 0) {
+        QLIST_REMOVE(m, next_in_flight);
         return cluster_offset;
     }
 

block/qcow2.c

diff --git a/block/qcow2.c b/block/qcow2.c
index b44a12c..4e97eb6 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -625,11 +625,15 @@
                                     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);