From patchwork Fri Apr 13 18:45:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: xen_disk: use bdrv_aio_flush instead of bdrv_flush Date: Fri, 13 Apr 2012 08:45:08 -0000 From: Stefano Stabellini X-Patchwork-Id: 152381 Message-Id: <1334342708-30987-1-git-send-email-stefano.stabellini@eu.citrix.com> To: xen-devel@lists.xensource.com Cc: qemu-devel@nongnu.org, Stefano Stabellini Signed-off-by: Stefano Stabellini --- hw/xen_disk.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/hw/xen_disk.c b/hw/xen_disk.c index 84ca76e..3e4a47b 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -324,9 +324,6 @@ static void qemu_aio_complete(void *opaque, int ret) 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); @@ -343,9 +340,9 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq) goto err_no_map; } - ioreq->aio_inflight++; if (ioreq->presync) { - bdrv_flush(blkdev->bs); /* FIXME: aio_flush() ??? */ + ioreq->aio_inflight++; + bdrv_aio_flush(ioreq->blkdev->bs, qemu_aio_complete, ioreq); } switch (ioreq->req.operation) { @@ -372,8 +369,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;