From nobody Mon Feb 9 11:04:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1491909296681886.8898732012384; Tue, 11 Apr 2017 04:14:56 -0700 (PDT) Received: from localhost ([::1]:38517 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxtl9-0003L3-8L for importer@patchew.org; Tue, 11 Apr 2017 07:14:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxtkP-00030v-G5 for qemu-devel@nongnu.org; Tue, 11 Apr 2017 07:14:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxtkO-0006Hl-GA for qemu-devel@nongnu.org; Tue, 11 Apr 2017 07:14:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48734) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cxtkJ-0006G1-4z; Tue, 11 Apr 2017 07:14:03 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 22CCA4DD62; Tue, 11 Apr 2017 11:14:02 +0000 (UTC) Received: from noname.str.redhat.com (dhcp-192-175.str.redhat.com [10.33.192.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 13800627DE; Tue, 11 Apr 2017 11:13:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 22CCA4DD62 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kwolf@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 22CCA4DD62 From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 11 Apr 2017 13:13:53 +0200 Message-Id: <1491909233-24890-1-git-send-email-kwolf@redhat.com> In-Reply-To: <20170410150542.30376-1-famz@redhat.com> References: <20170410150542.30376-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 11 Apr 2017 11:14:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for 2.9 v3 11/10] block, async: Remove unused *_enter_if_inactive() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, famz@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, eswierk@skyportsystems.com, stefanha@redhat.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Kevin Wolf --- block.c | 5 ----- include/block/aio.h | 9 --------- include/block/block.h | 6 ------ util/async.c | 7 ------- 4 files changed, 27 deletions(-) diff --git a/block.c b/block.c index e65b906..086a12d 100644 --- a/block.c +++ b/block.c @@ -4329,11 +4329,6 @@ void bdrv_coroutine_enter(BlockDriverState *bs, Coro= utine *co) aio_co_enter(bdrv_get_aio_context(bs), co); } =20 -void bdrv_coroutine_enter_if_inactive(BlockDriverState *bs, Coroutine *co) -{ - aio_co_enter_if_inactive(bdrv_get_aio_context(bs), co); -} - static void bdrv_do_remove_aio_context_notifier(BdrvAioNotifier *ban) { QLIST_REMOVE(ban, list); diff --git a/include/block/aio.h b/include/block/aio.h index b0a6bb3..406e323 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -520,15 +520,6 @@ void aio_co_wake(struct Coroutine *co); void aio_co_enter(AioContext *ctx, struct Coroutine *co); =20 /** - * aio_co_enter_if_inactive: - * @ctx: the context to run the coroutine - * @co: the coroutine to run - * - * Enter a coroutine in the specified AioContext, if it's not already ente= red. - */ -void aio_co_enter_if_inactive(AioContext *ctx, struct Coroutine *co); - -/** * Return the AioContext whose event loop runs in the current thread. * * If called from an IOThread this will be the IOThread's AioContext. If diff --git a/include/block/block.h b/include/block/block.h index dd9416e..97d4330 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -563,12 +563,6 @@ AioContext *bdrv_get_aio_context(BlockDriverState *bs); void bdrv_coroutine_enter(BlockDriverState *bs, Coroutine *co); =20 /** - * Transfer control to @co in the aio context of @bs if it's not active (i= .e. - * part of the call stack of the running coroutine). Otherwise, do nothing. - */ -void bdrv_coroutine_enter_if_inactive(BlockDriverState *bs, Coroutine *co); - -/** * bdrv_set_aio_context: * * Changes the #AioContext used for fd handlers, timers, and BHs by this diff --git a/util/async.c b/util/async.c index 507671a..355af73 100644 --- a/util/async.c +++ b/util/async.c @@ -474,13 +474,6 @@ void aio_co_enter(AioContext *ctx, struct Coroutine *c= o) } } =20 -void aio_co_enter_if_inactive(AioContext *ctx, struct Coroutine *co) -{ - if (!qemu_coroutine_entered(co)) { - aio_co_enter(ctx, co); - } -} - void aio_context_ref(AioContext *ctx) { g_source_ref(&ctx->source); --=20 1.8.3.1