From patchwork Fri Sep 16 14:25:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 114947 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 19B8BB6F81 for ; Sat, 17 Sep 2011 01:06:37 +1000 (EST) Received: from localhost ([::1]:50419 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4ZO1-0006Dz-2H for incoming@patchwork.ozlabs.org; Fri, 16 Sep 2011 10:27:25 -0400 Received: from eggs.gnu.org ([140.186.70.92]:58730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4ZNA-0003Xk-58 for qemu-devel@nongnu.org; Fri, 16 Sep 2011 10:26:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R4ZMx-000517-6a for qemu-devel@nongnu.org; Fri, 16 Sep 2011 10:26:23 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:48095) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4ZMw-0004wc-Rq for qemu-devel@nongnu.org; Fri, 16 Sep 2011 10:26:19 -0400 Received: by mail-ww0-f53.google.com with SMTP id 14so4633242wwg.10 for ; Fri, 16 Sep 2011 07:26:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=L2Ro1/NAR4BpwHk6GHAsXZte644akAyHFXD99saAC5A=; b=R+rLKMx1k9CmqZ6aLxOFh66GEqrCn2IGTysyOGQr/xdo3aQBuXPP5jlDQnscUtsnem I4lJ6gVEU2HJidhtg6DcI7MJuhvmQB/z9URNRpXI76mPEqZR+CyoPjaLh3k8JwXPFZsl EmijAJiJ42tnZQJsBigJxfJyLPr/r5VDa+Ivs= Received: by 10.216.156.146 with SMTP id m18mr769792wek.108.1316183178430; Fri, 16 Sep 2011 07:26:18 -0700 (PDT) Received: from localhost.localdomain (93-34-199-31.ip51.fastwebnet.it. [93.34.199.31]) by mx.google.com with ESMTPS id ek13sm12701198wbb.23.2011.09.16.07.26.17 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 16 Sep 2011 07:26:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 16 Sep 2011 16:25:44 +0200 Message-Id: <1316183152-5481-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1316183152-5481-1-git-send-email-pbonzini@redhat.com> References: <1316183152-5481-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Subject: [Qemu-devel] [PATCH v2 07/15] block: add bdrv_co_flush support 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: Paolo Bonzini --- block.c | 45 +++++++++++++++++++++++++++++++++++---------- block_int.h | 1 + 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/block.c b/block.c index 394ecaf..f4b9089 100644 --- a/block.c +++ b/block.c @@ -66,6 +66,8 @@ static BlockDriverAIOCB *bdrv_co_aio_readv_em(BlockDriverState *bs, static BlockDriverAIOCB *bdrv_co_aio_writev_em(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque); +static BlockDriverAIOCB *bdrv_co_aio_flush_em(BlockDriverState *bs, + BlockDriverCompletionFunc *cb, void *opaque); static int coroutine_fn bdrv_co_readv_em(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *iov); @@ -199,7 +201,11 @@ void bdrv_register(BlockDriver *bdrv) } } - if (!bdrv->bdrv_aio_flush) { + if (bdrv->bdrv_co_flush) { + bdrv->bdrv_aio_flush = bdrv_co_aio_flush_em; + } else if (bdrv->bdrv_aio_flush) { + bdrv->bdrv_co_flush = bdrv_co_flush_em; + } else { bdrv->bdrv_aio_flush = bdrv_aio_flush_em; } @@ -1035,11 +1041,6 @@ static inline bool bdrv_has_async_rw(BlockDriver *drv) || drv->bdrv_aio_readv != bdrv_aio_readv_em; } -static inline bool bdrv_has_async_flush(BlockDriver *drv) -{ - return drv->bdrv_aio_flush != bdrv_aio_flush_em; -} - /* return < 0 if error. See bdrv_write() for the return codes */ int bdrv_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, int nb_sectors) @@ -1742,8 +1743,8 @@ int bdrv_flush(BlockDriverState *bs) return 0; } - if (bs->drv && bdrv_has_async_flush(bs->drv) && qemu_in_coroutine()) { - return bdrv_co_flush_em(bs); + if (bs->drv && bs->drv->bdrv_co_flush && qemu_in_coroutine()) { + return bs->drv->bdrv_co_flush(bs); } if (bs->drv && bs->drv->bdrv_flush) { @@ -2764,7 +2765,7 @@ static AIOPool bdrv_em_co_aio_pool = { .cancel = bdrv_aio_co_cancel_em, }; -static void bdrv_co_rw_bh(void *opaque) +static void bdrv_co_em_bh(void *opaque) { BlockDriverAIOCBCoroutine *acb = opaque; @@ -2786,7 +2787,7 @@ static void coroutine_fn bdrv_co_rw(void *opaque) acb->req.nb_sectors, acb->req.qiov); } - acb->bh = qemu_bh_new(bdrv_co_rw_bh, acb); + acb->bh = qemu_bh_new(bdrv_co_em_bh, acb); qemu_bh_schedule(acb->bh); } @@ -2829,6 +2830,30 @@ static BlockDriverAIOCB *bdrv_co_aio_writev_em(BlockDriverState *bs, true); } +static void coroutine_fn bdrv_co_flush(void *opaque) +{ + BlockDriverAIOCBCoroutine *acb = opaque; + BlockDriverState *bs = acb->common.bs; + + acb->req.error = bs->drv->bdrv_co_flush(bs); + acb->bh = qemu_bh_new(bdrv_co_em_bh, acb); + qemu_bh_schedule(acb->bh); +} + +static BlockDriverAIOCB *bdrv_co_aio_flush_em(BlockDriverState *bs, + BlockDriverCompletionFunc *cb, + void *opaque) +{ + Coroutine *co; + BlockDriverAIOCBCoroutine *acb; + + acb = qemu_aio_get(&bdrv_em_co_aio_pool, bs, cb, opaque); + co = qemu_coroutine_create(bdrv_co_flush); + qemu_coroutine_enter(co, acb); + + return &acb->common; +} + static BlockDriverAIOCB *bdrv_aio_flush_em(BlockDriverState *bs, BlockDriverCompletionFunc *cb, void *opaque) { diff --git a/block_int.h b/block_int.h index 8c3b863..bb39b0b 100644 --- a/block_int.h +++ b/block_int.h @@ -83,6 +83,7 @@ struct BlockDriver { int64_t sector_num, int nb_sectors, QEMUIOVector *qiov); int coroutine_fn (*bdrv_co_writev)(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov); + int coroutine_fn (*bdrv_co_flush)(BlockDriverState *bs); int (*bdrv_aio_multiwrite)(BlockDriverState *bs, BlockRequest *reqs, int num_reqs);