From nobody Fri May 3 15:23:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571893077; cv=none; d=zoho.com; s=zohoarc; b=ErVeTlyiCrPjqHtHQLm6l9tvPTVQG2a5FZktPg0j/+IdCreWJNSE3kcxBEtSyw31+8QiACTugIvgE+1rccmfLbKMji1J/RAFYaO12JJGPtvfiHdjbWyEoCACHess0ik3fM3bWttVofMiD64eOi786DmVbKGCsO+whlV/MfIZvis= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571893077; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=sBe4JGSBSpRdP4IB8NUSLYsGyzB309HaB4TZOvo9okk=; b=VVzAkTKFX1K3eCvulSZi4CIKUiaBe7dLfeqLmpeYjt7NKEx2RSQNEHPtSgULffZ2EmaVZxTnUaeRkAYf0EJCniPBMmNKA6pi94u+YFrO3x0w5DL/w68UJg7CuC7NDlJvdj1SaoXkOUBZ60ndDftVhfPn89CHBJpFk6sHDJYKXNw= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571893077556999.157176536296; Wed, 23 Oct 2019 21:57:57 -0700 (PDT) Received: from localhost ([::1]:60016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNVC5-00087S-Pk for importer@patchew.org; Thu, 24 Oct 2019 00:57:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51211) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNVAi-00076o-Md for qemu-devel@nongnu.org; Thu, 24 Oct 2019 00:56:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNVAh-0002N1-8l for qemu-devel@nongnu.org; Thu, 24 Oct 2019 00:56:28 -0400 Received: from 212-186-127-178.static.upcbusiness.at ([212.186.127.178]:39081 helo=rtest1.maurer-it.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iNVAg-0002Go-Uw for qemu-devel@nongnu.org; Thu, 24 Oct 2019 00:56:27 -0400 Received: by rtest1.maurer-it.com (Postfix, from userid 0) id 0516E500AE8; Thu, 24 Oct 2019 06:56:16 +0200 (CEST) From: Dietmar Maurer To: qemu-devel@nongnu.org Subject: [PATCH v4] yield_until_fd_readable: make it work with any AioContect Date: Thu, 24 Oct 2019 06:56:10 +0200 Message-Id: <20191024045610.9071-1-dietmar@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.186.127.178 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dietmar Maurer , stefanha@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Simply use qemu_get_current_aio_context(). Signed-off-by: Dietmar Maurer --- Changelog for v4: - avoid unsafe cast and keep fd_coroutine_enter() Changelog for v3: - use (IOHandler *) instead of ((void (*)(void *)) - coding style: fix max line length Changelog for v2: - use correct read handler in aio_set_fd_handler (instead of write handler) util/qemu-coroutine-io.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/util/qemu-coroutine-io.c b/util/qemu-coroutine-io.c index 44a8969a69..5b80bb416f 100644 --- a/util/qemu-coroutine-io.c +++ b/util/qemu-coroutine-io.c @@ -67,6 +67,7 @@ qemu_co_send_recv(int sockfd, void *buf, size_t bytes, bo= ol do_send) } =20 typedef struct { + AioContext *ctx; Coroutine *co; int fd; } FDYieldUntilData; @@ -74,7 +75,7 @@ typedef struct { static void fd_coroutine_enter(void *opaque) { FDYieldUntilData *data =3D opaque; - qemu_set_fd_handler(data->fd, NULL, NULL, NULL); + aio_set_fd_handler(data->ctx, data->fd, false, NULL, NULL, NULL, NULL); qemu_coroutine_enter(data->co); } =20 @@ -83,8 +84,10 @@ void coroutine_fn yield_until_fd_readable(int fd) FDYieldUntilData data; =20 assert(qemu_in_coroutine()); + data.ctx =3D qemu_get_current_aio_context(); data.co =3D qemu_coroutine_self(); data.fd =3D fd; - qemu_set_fd_handler(fd, fd_coroutine_enter, NULL, &data); + aio_set_fd_handler( + data.ctx, fd, false, fd_coroutine_enter, NULL, NULL, &data); qemu_coroutine_yield(); } --=20 2.20.1