From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH 2/3] xen_disk: use bdrv_aio_flush instead of bdrv_flush Date: Tue, 24 Apr 2012 14:08:48 +0100 Message-ID: <1335272929-22967-2-git-send-email-stefano.stabellini@eu.citrix.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xensource.com Cc: Ian.Jackson@eu.citrix.com, Stefano Stabellini List-Id: xen-devel@lists.xenproject.org Signed-off-by: Stefano Stabellini --- hw/xen_disk.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/hw/xen_disk.c b/hw/xen_disk.c index f9ef062..900f456 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -382,8 +382,6 @@ static void qemu_aio_complete(void *opaque, int ret) ioreq->aio_inflight--; if (ioreq->aio_inflight > 0) return; - if (ioreq->postsync) - bdrv_flush(ioreq->blkdev->bs); ioreq->status = ioreq->aio_errors ? BLKIF_RSP_ERROR : BLKIF_RSP_OKAY; ioreq_unmap(ioreq); @@ -398,9 +396,10 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq) if (ioreq->req.nr_segments && ioreq_map(ioreq) == -1) goto err; - ioreq->aio_inflight++; - if (ioreq->presync) - bdrv_flush(blkdev->bs); /* FIXME: aio_flush() ??? */ + if (ioreq->presync) { + ioreq->aio_inflight++; + bdrv_aio_flush(ioreq->blkdev->bs, qemu_aio_complete, ioreq); + } switch (ioreq->req.operation) { case BLKIF_OP_READ: @@ -422,8 +421,10 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq) /* unknown operation (shouldn't happen -- parse catches this) */ goto err; } - - qemu_aio_complete(ioreq, 0); + if (ioreq->postsync) { + ioreq->aio_inflight++; + bdrv_aio_flush(ioreq->blkdev->bs, qemu_aio_complete, ioreq); + } return 0; -- 1.7.2.5