From nobody Fri Apr 11 21:07:48 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548327051558646.7826892562225; Thu, 24 Jan 2019 02:50:51 -0800 (PST) Received: from localhost ([127.0.0.1]:51194 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmcai-0000gT-4N for importer@patchew.org; Thu, 24 Jan 2019 05:50:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmcGS-0001sD-HR for qemu-devel@nongnu.org; Thu, 24 Jan 2019 05:29:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmcGR-0001DY-J3 for qemu-devel@nongnu.org; Thu, 24 Jan 2019 05:29:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45644) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmcG6-0000Xd-Fs; Thu, 24 Jan 2019 05:29:18 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 78B78C070E2A; Thu, 24 Jan 2019 10:29:17 +0000 (UTC) Received: from localhost (ovpn-116-104.ams2.redhat.com [10.36.116.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id 078CC5D6A6; Thu, 24 Jan 2019 10:29:16 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Thu, 24 Jan 2019 10:29:00 +0000 Message-Id: <20190124102900.20079-4-stefanha@redhat.com> In-Reply-To: <20190124102900.20079-1-stefanha@redhat.com> References: <20190124102900.20079-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 24 Jan 2019 10:29:17 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/3] qemu-coroutine-sleep: drop CoSleepCB X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Peter Maydell , Vladimir Sementsov-Ogievskiy , Alberto Garcia , qemu-block@nongnu.org, Stefan Weil , Max Reitz , Stefan Hajnoczi , Kevin Wolf Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Drop CoSleepCB structure. It's actually unused. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-id: 20190122143113.20331-1-vsementsov@virtuozzo.com Signed-off-by: Stefan Hajnoczi --- util/qemu-coroutine-sleep.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c index afb678fbe5..4bfdd30cbf 100644 --- a/util/qemu-coroutine-sleep.c +++ b/util/qemu-coroutine-sleep.c @@ -17,38 +17,31 @@ #include "qemu/timer.h" #include "block/aio.h" =20 -typedef struct CoSleepCB { - QEMUTimer *ts; - Coroutine *co; -} CoSleepCB; - static void co_sleep_cb(void *opaque) { - CoSleepCB *sleep_cb =3D opaque; + Coroutine *co =3D opaque; =20 /* Write of schedule protected by barrier write in aio_co_schedule */ - atomic_set(&sleep_cb->co->scheduled, NULL); - aio_co_wake(sleep_cb->co); + atomic_set(&co->scheduled, NULL); + aio_co_wake(co); } =20 void coroutine_fn qemu_co_sleep_ns(QEMUClockType type, int64_t ns) { AioContext *ctx =3D qemu_get_current_aio_context(); - CoSleepCB sleep_cb =3D { - .co =3D qemu_coroutine_self(), - }; + QEMUTimer *ts; + Coroutine *co =3D qemu_coroutine_self(); =20 - const char *scheduled =3D atomic_cmpxchg(&sleep_cb.co->scheduled, NULL, - __func__); + const char *scheduled =3D atomic_cmpxchg(&co->scheduled, NULL, __func_= _); if (scheduled) { fprintf(stderr, "%s: Co-routine was already scheduled in '%s'\n", __func__, scheduled); abort(); } - sleep_cb.ts =3D aio_timer_new(ctx, type, SCALE_NS, co_sleep_cb, &sleep= _cb); - timer_mod(sleep_cb.ts, qemu_clock_get_ns(type) + ns); + ts =3D aio_timer_new(ctx, type, SCALE_NS, co_sleep_cb, co); + timer_mod(ts, qemu_clock_get_ns(type) + ns); qemu_coroutine_yield(); - timer_del(sleep_cb.ts); - timer_free(sleep_cb.ts); + timer_del(ts); + timer_free(ts); } --=20 2.20.1