From nobody Mon Feb 9 23:57:57 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=1657039203; cv=none; d=zohomail.com; s=zohoarc; b=eg3Lsqu/xDZbh2l+XMhMf/TncZBjmtLCMUhl1sjxY68JzA8nIHsX8b32hMBjh4s204wWbGfvzGRZIkhXFzpOGvnJIcI2X8C+KqSzG7iWwz8LK28LvkDD9XE6McTGzVcTr0/SQIyNhfTH/EI1fCUlEok1CSpyAiD/cRhwayVGJRs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657039203; 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=20GuzBKn07Iukwf2n8M0ff0b2Gru7xypm13DxC9ct+s=; b=NhhWjhR9BFirIJ3E5aNYUoMe3A9Lt/+QunizUtRZo7iEe0iraCbZHLJvzg6/cGfIev1sWSKnlybIOuOoV/8V2L/nGzc0GbFvM22fVApXqB4q+Dd5TCueeV8W2/DseT8LIk/dGY9KJoqmo9jf8da0WSvSQ5gsW7kPnzEk7sVXcIw= 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 165703920385417.08692314748305; Tue, 5 Jul 2022 09:40:03 -0700 (PDT) Received: from localhost ([::1]:58292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o8laf-0006Jk-1e for importer@patchew.org; Tue, 05 Jul 2022 12:39:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8lF9-0005u0-Mv for qemu-devel@nongnu.org; Tue, 05 Jul 2022 12:17:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:30132) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8lF6-0006BC-FH for qemu-devel@nongnu.org; Tue, 05 Jul 2022 12:17:43 -0400 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-97-PDVHub9zP8WzWrrF3tS7RQ-1; Tue, 05 Jul 2022 12:17:35 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7FCAD3810D55; Tue, 5 Jul 2022 16:17:12 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E84D14682C2; Tue, 5 Jul 2022 16:17:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657037859; 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=20GuzBKn07Iukwf2n8M0ff0b2Gru7xypm13DxC9ct+s=; b=Skh+j9hKiQ3IZAWrr+MY7WpKf89QAcIRZuqPledN/ALDhdOGs47PJwMkjDDDgc7i65JO4X SBbT0XQfhGOqxOIqQ2dSul6mkOLOsmTN7LZHBgr0ZdrOtk8/GeFX49rMtEAOZ7XajvRxo/ ghX7G4kIsZ2twihlf+fRmykVA5D5Zf4= X-MC-Unique: PDVHub9zP8WzWrrF3tS7RQ-1 From: Alberto Faria To: qemu-devel@nongnu.org Cc: Beniamino Galvani , Juan Quintela , Vladimir Sementsov-Ogievskiy , Eric Blake , Niek Linnenbank , Palmer Dabbelt , Laurent Vivier , Stefan Weil , "Edgar E. Iglesias" , Stefan Hajnoczi , Alistair Francis , qemu-ppc@nongnu.org, Fam Zheng , Jeff Cody , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson , "Dr. David Alan Gilbert" , Joel Stanley , Bin Meng , Emanuele Giuseppe Esposito , John Snow , Andrew Jeffery , qemu-riscv@nongnu.org, Greg Kurz , Daniel Henrique Barboza , Peter Maydell , Hanna Reitz , qemu-block@nongnu.org, "Denis V. Lunev" , qemu-arm@nongnu.org, Alberto Faria , Paolo Bonzini Subject: [PATCH v2 15/18] block: Add blk_co_ioctl() Date: Tue, 5 Jul 2022 17:15:23 +0100 Message-Id: <20220705161527.1054072-16-afaria@redhat.com> In-Reply-To: <20220705161527.1054072-1-afaria@redhat.com> References: <20220705161527.1054072-1-afaria@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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=afaria@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657039205488100001 Content-Type: text/plain; charset="utf-8" Also convert blk_ioctl() into a generated_co_wrapper. Signed-off-by: Alberto Faria Reviewed-by: Paolo Bonzini Reviewed-by: Hanna Reitz --- block/block-backend.c | 7 ++++--- block/coroutines.h | 6 ------ include/sysemu/block-backend-io.h | 5 ++++- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index 0718441b37..7bad42259e 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1624,7 +1624,7 @@ void blk_aio_cancel_async(BlockAIOCB *acb) } =20 /* To be called between exactly one pair of blk_inc/dec_in_flight() */ -int coroutine_fn +static int coroutine_fn blk_co_do_ioctl(BlockBackend *blk, unsigned long int req, void *buf) { IO_CODE(); @@ -1638,13 +1638,14 @@ blk_co_do_ioctl(BlockBackend *blk, unsigned long in= t req, void *buf) return bdrv_co_ioctl(blk_bs(blk), req, buf); } =20 -int blk_ioctl(BlockBackend *blk, unsigned long int req, void *buf) +int coroutine_fn blk_co_ioctl(BlockBackend *blk, unsigned long int req, + void *buf) { int ret; IO_OR_GS_CODE(); =20 blk_inc_in_flight(blk); - ret =3D blk_do_ioctl(blk, req, buf); + ret =3D blk_co_do_ioctl(blk, req, buf); blk_dec_in_flight(blk); =20 return ret; diff --git a/block/coroutines.h b/block/coroutines.h index 7e94b9fa83..d66551a277 100644 --- a/block/coroutines.h +++ b/block/coroutines.h @@ -68,9 +68,6 @@ blk_co_do_pwritev_part(BlockBackend *blk, int64_t offset,= int64_t bytes, QEMUIOVector *qiov, size_t qiov_offset, BdrvRequestFlags flags); =20 -int coroutine_fn -blk_co_do_ioctl(BlockBackend *blk, unsigned long int req, void *buf); - int coroutine_fn blk_co_do_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes); =20 @@ -107,7 +104,4 @@ bdrv_common_block_status_above(BlockDriverState *bs, int generated_co_wrapper nbd_do_establish_connection(BlockDriverState *bs, bool blocking, Error **e= rrp); =20 -int generated_co_wrapper -blk_do_ioctl(BlockBackend *blk, unsigned long int req, void *buf); - #endif /* BLOCK_COROUTINES_H */ diff --git a/include/sysemu/block-backend-io.h b/include/sysemu/block-backe= nd-io.h index e6af0d0ed0..bb1ae25863 100644 --- a/include/sysemu/block-backend-io.h +++ b/include/sysemu/block-backend-io.h @@ -168,7 +168,10 @@ int coroutine_fn blk_co_pdiscard(BlockBackend *blk, in= t64_t offset, int generated_co_wrapper blk_flush(BlockBackend *blk); int coroutine_fn blk_co_flush(BlockBackend *blk); =20 -int blk_ioctl(BlockBackend *blk, unsigned long int req, void *buf); +int generated_co_wrapper blk_ioctl(BlockBackend *blk, unsigned long int re= q, + void *buf); +int coroutine_fn blk_co_ioctl(BlockBackend *blk, unsigned long int req, + void *buf); =20 int generated_co_wrapper blk_pwrite_compressed(BlockBackend *blk, int64_t offset, int64_t byt= es, --=20 2.36.1