From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nz8s8-0002Tp-Pz for qemu-devel@nongnu.org; Tue, 06 Apr 2010 09:31:16 -0400 Received: from [140.186.70.92] (port=34601 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nz8rx-0002OD-2i for qemu-devel@nongnu.org; Tue, 06 Apr 2010 09:31:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nz8ru-0006tf-9M for qemu-devel@nongnu.org; Tue, 06 Apr 2010 09:31:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26704) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nz8rt-0006tG-Kv for qemu-devel@nongnu.org; Tue, 06 Apr 2010 09:31:02 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o36DV0EG022020 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 6 Apr 2010 09:31:01 -0400 From: Kevin Wolf Date: Tue, 6 Apr 2010 15:30:14 +0200 Message-Id: <1270560614-31030-7-git-send-email-kwolf@redhat.com> In-Reply-To: <1270560614-31030-1-git-send-email-kwolf@redhat.com> References: <1270560614-31030-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 6/6] qcow2: Remove request from in-flight list after error List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com 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 --- block/qcow2-cluster.c | 1 + block/qcow2.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index ace3b85..639e05e 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -832,6 +832,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 2f34eec..11ce8d1 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -628,11 +628,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); -- 1.6.6.1