From nobody Sat Nov 15 23:39:23 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=quarantine dis=none) header.from=qq.com ARC-Seal: i=1; a=rsa-sha256; t=1745259760; cv=none; d=zohomail.com; s=zohoarc; b=ed/LOi2UAa9nPTEMPOporzqqegKHnOPV52Iydhszw6xRYffw3fSrv42+hCzJQo1uX7XLIUb4CJSM6naHlUhoKsTTfbU+fM5EwrTtMug5Qe19lK6TIq/IfGfUMYduh6+yZ+AldcEEOCsJoTKC6HDk70WYxw4bUusvluWbqKin/3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745259760; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Tl45TIOGSxAkFysukum9w0CUvwW3KYUli2sefCaQdTw=; b=VA1VDYZUiGqnTAYDTZeGgajY6E13l0fKaQHsEjRRoDuJcjrkCIKFN9LOkpp1rzjCKrMBdNcj4B8LIzsJRbTFWn6HptVN73ttS9k9hBtbaH850pKPUE0mqsI+QsdQYfCc9UubZCAfAOX1B257mr8xaniUqnq8QOd0zCmYWr/+BRA= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1745259760879757.2054880452074; Mon, 21 Apr 2025 11:22:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u6vmF-0004wn-Re; Mon, 21 Apr 2025 14:21:55 -0400 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 1u6vmA-0004vi-VM; Mon, 21 Apr 2025 14:21:52 -0400 Received: from out162-62-57-137.mail.qq.com ([162.62.57.137]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u6vm6-0001Uw-AJ; Mon, 21 Apr 2025 14:21:50 -0400 Received: from 192.168.182.133 ([117.147.34.254]) by newxmesmtplogicsvrszb20-0.qq.com (NewEsmtp) with SMTP id 55F86E80; Tue, 22 Apr 2025 02:21:31 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1745259693; bh=Tl45TIOGSxAkFysukum9w0CUvwW3KYUli2sefCaQdTw=; h=From:To:Cc:Subject:Date; b=K/n4g1OwPmpxtBkt9A4KQpHd1Nrp1jYuj5n+Vvm01zs3MN1yg+AZ+/b/mlyqKG48o 2YoyhbUq+hQIB7CH1tQ9O/AhejqvQoIiaUkvqe8LbVV9CAek2EBdUUqpD0jYF2+Acx NmzjwBvDs/2KmPIr0GaxKengNtCwhklPLXiTVyxk= X-QQ-mid: xmsmtpt1745259691to5wm6on3 Message-ID: X-QQ-XMAILINFO: MmpliBmRb3iCamuJb9f3OLCv7r90p83hxPZ+oRocdhuXid84wpUkjw8A9Kba3u +RpOo9m3rguUbS47RwOczr2rYY575cmYfvTUEcI66yKMR85W5eGtMueAoif3M6aGuF7xWHzEkuKk dGfapAy/bE12grscbE7iw5RJmATJuBLBYnUFOjzJYl0imTpC1GyZr63/xj6ikbR6LO6Ih1K4yjyt cITC/Yk8xRiIcpTAYo9iiNRDiind9hbL8r9p0hUixMevbtK+HCqOHfrPPFr+lDdNQiZOs5vRHs77 KsdevjNJiaDfI4SA7926Q7VpnPKxgVY1vEDoNX/e71p55DUyYo76LaD8IHC2+u1gAOpvf5axKrTQ 6GzGhWh23R0vY8k4vkCSzba7tDvOp8Sif2D7CiauW3Ca2yaQJK6Gq/m29vUCYS4nArs0pH/wDpGb qg2BtW/bbxWYOBb49/Onw+RSfosq36nMGJD8C2lHZIaCIsZhiEqZXUOeaUvZuSLAICvEMdD7nBA4 QuGc3vbEySM5a6SAObaPXD6XPIR0qEcrWV1fDHlZag2GbJdR2nSlhFhj9v9NwQVEyMJgfHQptkGf X9cJrLnLTQJOBKPzzInpte8E7P4R8gntiEXVNQnQS96l+dhn8Khq8GJb/d4zXlRP3jNjTLfuOlt+ cxMFUxomg6hmVtFt4Okn6ZrR0vwbk7j8Q79zMMJWwf3PNRKQFxbLdtmigyblT+xiSXd0eKA2aYaA +WMUz9w7QWisLW+tI72YNyUZMF/DJl2IAvzmHRVEEQB0V4Q2HD1kdv8W4ou2XU9Qom/16vo0FG4a oe2tN7D3C6sFFZRFsu6lNrlFIVW/uWgQwWtl+DthxuhKpCXkV42LT7lQqDMWKM3HHleqazanxVoi 4uPSsZy2KC5AbpAKJR+aI9nMW7q4rH1fRC15trccof7gV8+CF9uLFwNf3iRaSnU1QlJaUEGIsMWq SsldYpuZzM66E9ywl2Pw== X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Sunny Zhu To: qemu-devel@nongnu.org Cc: eblake@redhat.com, hreitz@redhat.com, kwolf@redhat.com, qemu-block@nongnu.org, sunnyzhyy@qq.com Subject: [PATCH v2] block: Remove unused callback function *bdrv_aio_pdiscard Date: Tue, 22 Apr 2025 02:21:26 +0800 X-OQ-MSGID: <20250421182126.42346-1-sunnyzhyy@qq.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=162.62.57.137; envelope-from=sunnyzhyy@qq.com; helo=out162-62-57-137.mail.qq.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HELO_DYNAMIC_IPADDR=1.951, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 @qq.com) X-ZM-MESSAGEID: 1745259763762019000 Content-Type: text/plain; charset="utf-8" The bytes type in *bdrv_aio_pdiscard should be int64_t rather than int. There are no drivers implementing the *bdrv_aio_pdiscard() callback, it appears to be an unused function. Therefore, we'll simply remove it instead of fixing it. Additionally, coroutine-based callbacks are preferred. If someone needs to implement bdrv_aio_pdiscard, a coroutine-based version would be straightforward to implement. Signed-off-by: Sunny Zhu Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block/io.c | 22 +++------------------- include/block/block_int-common.h | 4 ---- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/block/io.c b/block/io.c index 1ba8d1aeea..cfddeb4756 100644 --- a/block/io.c +++ b/block/io.c @@ -3102,7 +3102,7 @@ int coroutine_fn bdrv_co_pdiscard(BdrvChild *child, i= nt64_t offset, return 0; } =20 - if (!bs->drv->bdrv_co_pdiscard && !bs->drv->bdrv_aio_pdiscard) { + if (!bs->drv->bdrv_co_pdiscard) { return 0; } =20 @@ -3161,24 +3161,8 @@ int coroutine_fn bdrv_co_pdiscard(BdrvChild *child, = int64_t offset, ret =3D -ENOMEDIUM; goto out; } - if (bs->drv->bdrv_co_pdiscard) { - ret =3D bs->drv->bdrv_co_pdiscard(bs, offset, num); - } else { - BlockAIOCB *acb; - CoroutineIOCompletion co =3D { - .coroutine =3D qemu_coroutine_self(), - }; - - acb =3D bs->drv->bdrv_aio_pdiscard(bs, offset, num, - bdrv_co_io_em_complete, &co); - if (acb =3D=3D NULL) { - ret =3D -EIO; - goto out; - } else { - qemu_coroutine_yield(); - ret =3D co.ret; - } - } + + ret =3D bs->drv->bdrv_co_pdiscard(bs, offset, num); if (ret && ret !=3D -ENOTSUP) { goto out; } diff --git a/include/block/block_int-common.h b/include/block/block_int-com= mon.h index ebb4e56a50..0d8187f656 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -506,10 +506,6 @@ struct BlockDriver { BlockAIOCB * GRAPH_RDLOCK_PTR (*bdrv_aio_flush)( BlockDriverState *bs, BlockCompletionFunc *cb, void *opaque); =20 - BlockAIOCB * GRAPH_RDLOCK_PTR (*bdrv_aio_pdiscard)( - BlockDriverState *bs, int64_t offset, int bytes, - BlockCompletionFunc *cb, void *opaque); - int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_co_readv)(BlockDriverState *b= s, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov); =20 --=20 2.43.0