From patchwork Fri Aug 9 17:44:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Shepherd X-Patchwork-Id: 266129 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (unknown [IPv6:2001:4830:134:3::12]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 86B822C007A for ; Sat, 10 Aug 2013 04:24:38 +1000 (EST) Received: from localhost ([::1]:52647 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7qlK-00038b-Er for incoming@patchwork.ozlabs.org; Fri, 09 Aug 2013 13:46:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40908) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7qkS-0002ng-Kq for qemu-devel@nongnu.org; Fri, 09 Aug 2013 13:45:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V7qkM-00064s-LX for qemu-devel@nongnu.org; Fri, 09 Aug 2013 13:45:12 -0400 Received: from mail6.webfaction.com ([74.55.86.74]:50567 helo=smtp.webfaction.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7qkM-00064B-Ea for qemu-devel@nongnu.org; Fri, 09 Aug 2013 13:45:06 -0400 Received: from rhodium.sg.lan. (maths.r-prg.net.univ-paris7.fr [81.194.27.158]) by smtp.webfaction.com (Postfix) with ESMTP id B9589211A360; Fri, 9 Aug 2013 17:45:04 +0000 (UTC) From: Charlie Shepherd To: qemu-devel@nongnu.org Date: Fri, 9 Aug 2013 19:44:01 +0200 Message-Id: <1376070245-22557-11-git-send-email-charlie@ctshepherd.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1376070245-22557-1-git-send-email-charlie@ctshepherd.com> References: <1376070245-22557-1-git-send-email-charlie@ctshepherd.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 74.55.86.74 Cc: kwolf@redhat.com, stefanha@gmail.com, gabriel@kerneis.info, Charlie Shepherd , pbonzini@redhat.com Subject: [Qemu-devel] [RFC v2 11/15] Make bdrv_discard coroutine only and add bdrv_sync_discard 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 This patch renames the coroutine only bdrv_co_discard to bdrv_discard and the original bdrv_discard to bdrv_sync_discard. bdrv_sync_discard is synchronous only. Signed-off-by: Charlie Shepherd --- block.c | 12 +++--------- include/block/block.h | 3 ++- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/block.c b/block.c index c7b6f01..6995d3f 100644 --- a/block.c +++ b/block.c @@ -4190,7 +4190,7 @@ static void coroutine_fn bdrv_discard_co_entry(void *opaque) rwco->ret = bdrv_co_discard(rwco->bs, rwco->sector_num, rwco->nb_sectors); } -int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, +int coroutine_fn bdrv_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors) { if (!bs->drv) { @@ -4231,7 +4231,7 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, } } -int bdrv_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors) +int bdrv_sync_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors) { Coroutine *co; RwCo rwco = { @@ -4241,13 +4241,7 @@ int bdrv_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors) .ret = NOT_DONE, }; - if (qemu_in_coroutine()) { - /* Fast-path if already in coroutine context */ - bdrv_discard_co_entry(&rwco); - return rwco.ret; - } else { - return bdrv_sync_rwco(bdrv_discard_co_entry, &rwco); - } + return bdrv_sync_rwco(bdrv_discard_co_entry, &rwco); } /**************************************************************/ diff --git a/include/block/block.h b/include/block/block.h index a209102..65d8864 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -279,7 +279,8 @@ int bdrv_flush_all(void); void bdrv_close_all(void); void bdrv_drain_all(void); -int bdrv_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors); +int coroutine_fn bdrv_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors); +int bdrv_sync_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors); int bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors); int bdrv_has_zero_init_1(BlockDriverState *bs); int bdrv_has_zero_init(BlockDriverState *bs);