From patchwork Fri Apr 13 18:45:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 152381 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5552CB7011 for ; Sat, 14 Apr 2012 04:41:29 +1000 (EST) Received: from localhost ([::1]:58372 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIlR0-0002IY-J0 for incoming@patchwork.ozlabs.org; Fri, 13 Apr 2012 14:41:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIlQt-0002II-PN for qemu-devel@nongnu.org; Fri, 13 Apr 2012 14:41:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SIlQs-0000kF-5L for qemu-devel@nongnu.org; Fri, 13 Apr 2012 14:41:19 -0400 Received: from smtp.citrix.com ([66.165.176.89]:17147) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIlQs-0000k8-0g for qemu-devel@nongnu.org; Fri, 13 Apr 2012 14:41:18 -0400 X-IronPort-AV: E=Sophos;i="4.75,418,1330923600"; d="scan'208";a="24148090" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Apr 2012 14:40:59 -0400 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.213.0; Fri, 13 Apr 2012 14:40:59 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1SIlQU-0003Mn-1B; Fri, 13 Apr 2012 19:40:54 +0100 From: Stefano Stabellini To: xen-devel@lists.xensource.com Date: Fri, 13 Apr 2012 19:45:08 +0100 Message-ID: <1334342708-30987-1-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.0.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Cc: qemu-devel@nongnu.org, Stefano Stabellini Subject: [Qemu-devel] [PATCH] xen_disk: use bdrv_aio_flush instead of bdrv_flush X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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;