From patchwork Tue Aug 26 07:15:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 382990 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 08893140116 for ; Tue, 26 Aug 2014 17:19:55 +1000 (EST) Received: from localhost ([::1]:52222 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMB2n-00028g-2s for incoming@patchwork.ozlabs.org; Tue, 26 Aug 2014 03:19:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMAyc-0003GV-Ay for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:15:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMAyW-0005bs-4T for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:15:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48046) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMAyV-0005bb-Sj for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:15:28 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7Q7FREP017583 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 26 Aug 2014 03:15:27 -0400 Received: from T430.nay.redhat.com (dhcp-14-155.nay.redhat.com [10.66.14.155]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s7Q7FOjX017144; Tue, 26 Aug 2014 03:15:25 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 26 Aug 2014 15:15:43 +0800 Message-Id: <1409037343-23878-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH] coroutine: Drop co_sleep_ns X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org block_job_sleep_ns is the only user. Since we are moving towards AioContext aware code, it's better to use the explict version and drop the old one. Signed-off-by: Fam Zheng Reviewed-by: Benoît Canet --- blockjob.c | 2 +- include/block/coroutine.h | 8 -------- qemu-coroutine-sleep.c | 12 ------------ 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/blockjob.c b/blockjob.c index ca0b4e2..0689fdd 100644 --- a/blockjob.c +++ b/blockjob.c @@ -205,7 +205,7 @@ void block_job_sleep_ns(BlockJob *job, QEMUClockType type, int64_t ns) if (block_job_is_paused(job)) { qemu_coroutine_yield(); } else { - co_sleep_ns(type, ns); + co_aio_sleep_ns(bdrv_get_aio_context(job->bs), type, ns); } job->busy = true; } diff --git a/include/block/coroutine.h b/include/block/coroutine.h index b9b7f48..793df0e 100644 --- a/include/block/coroutine.h +++ b/include/block/coroutine.h @@ -203,14 +203,6 @@ void qemu_co_rwlock_unlock(CoRwlock *lock); /** * Yield the coroutine for a given duration * - * Note this function uses timers and hence only works when a main loop is in - * use. See main-loop.h and do not use from qemu-tool programs. - */ -void coroutine_fn co_sleep_ns(QEMUClockType type, int64_t ns); - -/** - * Yield the coroutine for a given duration - * * Behaves similarly to co_sleep_ns(), but the sleeping coroutine will be * resumed when using aio_poll(). */ diff --git a/qemu-coroutine-sleep.c b/qemu-coroutine-sleep.c index ad78fba..9abb7fd 100644 --- a/qemu-coroutine-sleep.c +++ b/qemu-coroutine-sleep.c @@ -27,18 +27,6 @@ static void co_sleep_cb(void *opaque) qemu_coroutine_enter(sleep_cb->co, NULL); } -void coroutine_fn co_sleep_ns(QEMUClockType type, int64_t ns) -{ - CoSleepCB sleep_cb = { - .co = qemu_coroutine_self(), - }; - sleep_cb.ts = timer_new(type, SCALE_NS, co_sleep_cb, &sleep_cb); - timer_mod(sleep_cb.ts, qemu_clock_get_ns(type) + ns); - qemu_coroutine_yield(); - timer_del(sleep_cb.ts); - timer_free(sleep_cb.ts); -} - void coroutine_fn co_aio_sleep_ns(AioContext *ctx, QEMUClockType type, int64_t ns) {