From patchwork Sun Oct 20 13:56:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dietmar Maurer X-Patchwork-Id: 1180009 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=proxmox.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46x1jg2HRdz9sP7 for ; Mon, 21 Oct 2019 01:04:37 +1100 (AEDT) Received: from localhost ([::1]:35722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMBov-0000Eu-Dk for incoming@patchwork.ozlabs.org; Sun, 20 Oct 2019 10:04:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48436) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMBoU-0000EH-Li for qemu-devel@nongnu.org; Sun, 20 Oct 2019 10:04:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMBoT-0003ag-5D for qemu-devel@nongnu.org; Sun, 20 Oct 2019 10:04:06 -0400 Received: from 212-186-127-178.static.upcbusiness.at ([212.186.127.178]:61294 helo=rtest1.maurer-it.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iMBoS-0003ZZ-Uq for qemu-devel@nongnu.org; Sun, 20 Oct 2019 10:04:05 -0400 Received: by rtest1.maurer-it.com (Postfix, from userid 0) id AA40D5000B6; Sun, 20 Oct 2019 15:56:41 +0200 (CEST) From: Dietmar Maurer To: qemu-devel@nongnu.org Subject: [PATCH ] yield_until_fd_readable: make it work with any AioContect Date: Sun, 20 Oct 2019 15:56:28 +0200 Message-Id: <20191020135628.16255-1-dietmar@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Simply use qemu_get_current_aio_context(). Signed-off-by: Dietmar Maurer --- util/qemu-coroutine-io.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/util/qemu-coroutine-io.c b/util/qemu-coroutine-io.c index 44a8969a69..2938c5420c 100644 --- a/util/qemu-coroutine-io.c +++ b/util/qemu-coroutine-io.c @@ -66,25 +66,11 @@ qemu_co_send_recv(int sockfd, void *buf, size_t bytes, bool do_send) return qemu_co_sendv_recvv(sockfd, &iov, 1, 0, bytes, do_send); } -typedef struct { - Coroutine *co; - int fd; -} FDYieldUntilData; - -static void fd_coroutine_enter(void *opaque) -{ - FDYieldUntilData *data = opaque; - qemu_set_fd_handler(data->fd, NULL, NULL, NULL); - qemu_coroutine_enter(data->co); -} - void coroutine_fn yield_until_fd_readable(int fd) { - FDYieldUntilData data; - assert(qemu_in_coroutine()); - data.co = qemu_coroutine_self(); - data.fd = fd; - qemu_set_fd_handler(fd, fd_coroutine_enter, NULL, &data); + AioContext *ctx = qemu_get_current_aio_context(); + aio_set_fd_handler(ctx, fd, false, NULL, (void (*)(void *))qemu_coroutine_enter, NULL, qemu_coroutine_self()); qemu_coroutine_yield(); + aio_set_fd_handler(ctx, fd, false, NULL, NULL, NULL, NULL); }