From nobody Sun Apr 13 09:46:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1674217631; cv=none; d=zohomail.com; s=zohoarc; b=Y4/FgWBMCE03N/LZpO9EgIu4tF749n58YB0zz3JNcGp20oZibsC614pSwEG0pd2VHZ7gFOJQ0Al1CbD/mpLtVp8UD4Ke69gyu7OQ8Z4Fn6U/kSJtwNIf6YhUTN/w9TfQDAzgeto/T9amISEx7JLE2+1x02GJEUXWgnHwb54Dt8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674217631; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DG4nb0aJyMEIhD89kW/MjVzdkVSKBz/osiNHW0Ha6Rk=; b=h2kMw5oFhbshGeYBkX/ImDq/ye2XYKH3tnJyHZO83kvtWoGplaLqo0fyEJMSG0AIa3VRkulAURrIVgyHUeLUiqUnmmRG0VsBn0vQSsc5bep0AQRnErZTh8eSFj8lXoqjS+jbtfXmmDEsCnnnXDZh843FFMqaUBumBGlBXq6DDMc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674217631241869.3181357779745; Fri, 20 Jan 2023 04:27:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIqTs-0002VF-TU; Fri, 20 Jan 2023 07:26:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIqTp-0002Rd-Sh for qemu-devel@nongnu.org; Fri, 20 Jan 2023 07:26:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIqTn-0000Hl-G6 for qemu-devel@nongnu.org; Fri, 20 Jan 2023 07:26:49 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-471-mPfZ93n1O-a1WDB3P1j9vQ-1; Fri, 20 Jan 2023 07:26:45 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4F3C92801E52; Fri, 20 Jan 2023 12:26:45 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.193.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84B4440C6EC4; Fri, 20 Jan 2023 12:26:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674217606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DG4nb0aJyMEIhD89kW/MjVzdkVSKBz/osiNHW0Ha6Rk=; b=F+wdkQiMgg+gouNFz8nAYnN+Wec8Ujue+dzoR9fJ2uG5M/0Y7AIRKNSh4zr4JLCYqO6Dyi UiYbsul0KBXsZrmows5UZOVVHG5ouffnTKqyoRoX5LVLGmFpDcqjn8Knukyhk2tRZ5OM4g 9bHNF8iaHQ5XWp6LG2tP2h6Knk24VTI= X-MC-Unique: mPfZ93n1O-a1WDB3P1j9vQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Subject: [PULL 07/38] block: remove bdrv_coroutine_enter Date: Fri, 20 Jan 2023 13:26:02 +0100 Message-Id: <20230120122633.84983-8-kwolf@redhat.com> In-Reply-To: <20230120122633.84983-1-kwolf@redhat.com> References: <20230120122633.84983-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1674217633231100003 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini It has only one caller---inline it and remove the function. Signed-off-by: Paolo Bonzini Message-Id: <20221215130225.476477-2-pbonzini@redhat.com> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- include/block/block-io.h | 5 ----- block.c | 6 ------ block/block-backend.c | 2 +- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/include/block/block-io.h b/include/block/block-io.h index 2ed6214909..1fa717a545 100644 --- a/include/block/block-io.h +++ b/include/block/block-io.h @@ -210,11 +210,6 @@ AioContext *coroutine_fn bdrv_co_enter(BlockDriverStat= e *bs); */ void coroutine_fn bdrv_co_leave(BlockDriverState *bs, AioContext *old_ctx); =20 -/** - * Transfer control to @co in the aio context of @bs - */ -void bdrv_coroutine_enter(BlockDriverState *bs, Coroutine *co); - AioContext *child_of_bds_get_parent_aio_context(BdrvChild *c); =20 void bdrv_io_plug(BlockDriverState *bs); diff --git a/block.c b/block.c index 9c2ac757e4..3f2bd12857 100644 --- a/block.c +++ b/block.c @@ -7177,12 +7177,6 @@ void coroutine_fn bdrv_co_unlock(BlockDriverState *b= s) } } =20 -void bdrv_coroutine_enter(BlockDriverState *bs, Coroutine *co) -{ - IO_CODE(); - aio_co_enter(bdrv_get_aio_context(bs), co); -} - static void bdrv_do_remove_aio_context_notifier(BdrvAioNotifier *ban) { GLOBAL_STATE_CODE(); diff --git a/block/block-backend.c b/block/block-backend.c index ba7bf1d6bc..8fbb787f41 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1555,7 +1555,7 @@ static BlockAIOCB *blk_aio_prwv(BlockBackend *blk, in= t64_t offset, acb->has_returned =3D false; =20 co =3D qemu_coroutine_create(co_entry, acb); - bdrv_coroutine_enter(blk_bs(blk), co); + aio_co_enter(blk_get_aio_context(blk), co); =20 acb->has_returned =3D true; if (acb->rwco.ret !=3D NOT_DONE) { --=20 2.38.1