From nobody Tue Feb 10 12:40:38 2026 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=1668588721; cv=none; d=zohomail.com; s=zohoarc; b=Ss8oo2NeUVR4Ux0T7A05tKaKpwYDAXkgZ0RZ3anGwwIGs/MZmaT9tGSKKDYdM6MAChhYR9TXvdb+EtmxEVZHhzm+i29t76HoDpM3vOaars1HUoNr0CYA/1VNVYHmfLPXk+btNGx5ahKY26fs2TjvJTI8QJjRrFh3i5cTUoTpPLc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1668588721; 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=9oy0eVZd2AWHWE0gSeNL+AiME+JCmB8NOawj7bmt9bE=; b=eiMSPL6vgoSPV05VoYnjfbjOpQbCsC5OSQhA/wxiaaQEXrtiJO1GuiutpoPG3Cem7eD197XU6RJhna1QExPyGPi1+OBu/F1Vl2VpYV3gsApxtwHYunHIqMYg6i7VtvsCnXLX17cMjwOozLbbf3NrsQb+nFFnDDFC+KlwL3vDwNg= 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 1668588721165552.6270079824842; Wed, 16 Nov 2022 00:52:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovE8i-0002ik-3A; Wed, 16 Nov 2022 03:51:24 -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 1ovE8V-0002YM-RL for qemu-devel@nongnu.org; Wed, 16 Nov 2022 03:51:11 -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 1ovE8P-0003p7-ED for qemu-devel@nongnu.org; Wed, 16 Nov 2022 03:51:09 -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-55-6VmgDbrOPWSZWQfDhV-kgA-1; Wed, 16 Nov 2022 03:51:03 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E3428381A733; Wed, 16 Nov 2022 08:51:02 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id A862220290A5; Wed, 16 Nov 2022 08:51:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668588664; 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=9oy0eVZd2AWHWE0gSeNL+AiME+JCmB8NOawj7bmt9bE=; b=QvEdcYr8iR8ElXovhhJMiw9Od37WSA6SiSjczrdWANmgCIEf1znsG0lRKgIc2vGsmNvyMi IPWuzEoVruOfXRnOeZZfFBz+3ayzQ0dVTBon0YAfbX6wPOii++S6K+h8gxD9H72g+nJ5ru 9Qv729m3iFcMdERMgoelFokR8/Au/qs= X-MC-Unique: 6VmgDbrOPWSZWQfDhV-kgA-1 From: Emanuele Giuseppe Esposito To: qemu-block@nongnu.org Cc: Kevin Wolf , Hanna Reitz , John Snow , Vladimir Sementsov-Ogievskiy , Eric Blake , Fam Zheng , qemu-devel@nongnu.org, Emanuele Giuseppe Esposito Subject: [PATCH v3 8/8] block/dirty-bitmap: remove unnecessary qemu_in_coroutine() case Date: Wed, 16 Nov 2022 03:50:50 -0500 Message-Id: <20221116085050.2295179-9-eesposit@redhat.com> In-Reply-To: <20221116085050.2295179-1-eesposit@redhat.com> References: <20221116085050.2295179-1-eesposit@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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=eesposit@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: 1668588722457100003 Content-Type: text/plain; charset="utf-8" Some functions check if they are running in a coroutine, calling the coroutine callback directly if it's the case. Except that no coroutine calls such functions, therefore that case can be removed. Signed-off-by: Emanuele Giuseppe Esposito --- block/dirty-bitmap.c | 66 +++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index bf3dc0512a..8092d08261 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -418,24 +418,20 @@ bdrv_co_remove_persistent_dirty_bitmap_entry(void *op= aque) int bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char *= name, Error **errp) { - if (qemu_in_coroutine()) { - return bdrv_co_remove_persistent_dirty_bitmap(bs, name, errp); - } else { - Coroutine *co; - BdrvRemovePersistentDirtyBitmapCo s =3D { - .bs =3D bs, - .name =3D name, - .errp =3D errp, - .ret =3D -EINPROGRESS, - }; - - co =3D qemu_coroutine_create(bdrv_co_remove_persistent_dirty_bitma= p_entry, - &s); - bdrv_coroutine_enter(bs, co); - BDRV_POLL_WHILE(bs, s.ret =3D=3D -EINPROGRESS); - - return s.ret; - } + Coroutine *co; + BdrvRemovePersistentDirtyBitmapCo s =3D { + .bs =3D bs, + .name =3D name, + .errp =3D errp, + .ret =3D -EINPROGRESS, + }; + assert(!qemu_in_coroutine()); + co =3D qemu_coroutine_create(bdrv_co_remove_persistent_dirty_bitmap_en= try, + &s); + bdrv_coroutine_enter(bs, co); + BDRV_POLL_WHILE(bs, s.ret =3D=3D -EINPROGRESS); + + return s.ret; } =20 bool @@ -494,25 +490,21 @@ bool bdrv_can_store_new_dirty_bitmap(BlockDriverState= *bs, const char *name, uint32_t granularity, Error **errp) { IO_CODE(); - if (qemu_in_coroutine()) { - return bdrv_co_can_store_new_dirty_bitmap(bs, name, granularity, e= rrp); - } else { - Coroutine *co; - BdrvCanStoreNewDirtyBitmapCo s =3D { - .bs =3D bs, - .name =3D name, - .granularity =3D granularity, - .errp =3D errp, - .in_progress =3D true, - }; - - co =3D qemu_coroutine_create(bdrv_co_can_store_new_dirty_bitmap_en= try, - &s); - bdrv_coroutine_enter(bs, co); - BDRV_POLL_WHILE(bs, s.in_progress); - - return s.ret; - } + Coroutine *co; + BdrvCanStoreNewDirtyBitmapCo s =3D { + .bs =3D bs, + .name =3D name, + .granularity =3D granularity, + .errp =3D errp, + .in_progress =3D true, + }; + assert(!qemu_in_coroutine()); + co =3D qemu_coroutine_create(bdrv_co_can_store_new_dirty_bitmap_entry, + &s); + bdrv_coroutine_enter(bs, co); + BDRV_POLL_WHILE(bs, s.in_progress); + + return s.ret; } =20 void bdrv_disable_dirty_bitmap(BdrvDirtyBitmap *bitmap) --=20 2.31.1