From: Feiran Zheng <famcool@gmail.com>
Date: Wed, 9 Mar 2011 13:19:35 +0000 (+0800)
Subject: hw/xen_disk: aio_inflight not released in handling ioreq when nr_segments==0
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=209bef3e014ba1613759575e2c10f0ef8d64eb84;p=qmiga%2Fqemu.git

hw/xen_disk: aio_inflight not released in handling ioreq when nr_segments==0

In hw/xen_disk.c, async writing ioreq is leaked when
ioreq->req.nr_segments==0, because `aio_inflight` flag is not released
properly (skipped by misplaced "break").

Signed-off-by: Feiran Zheng <famcool@gmail.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/hw/xen_disk.c b/hw/xen_disk.c
index ed9e5eb4d7..445bf03aa0 100644
--- a/hw/xen_disk.c
+++ b/hw/xen_disk.c
@@ -408,9 +408,9 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq)
 	break;
     case BLKIF_OP_WRITE:
     case BLKIF_OP_WRITE_BARRIER:
-        ioreq->aio_inflight++;
         if (!ioreq->req.nr_segments)
             break;
+        ioreq->aio_inflight++;
         bdrv_aio_writev(blkdev->bs, ioreq->start / BLOCK_SIZE,
                         &ioreq->v, ioreq->v.size / BLOCK_SIZE,
                         qemu_aio_complete, ioreq);