From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNP4P-0007SI-5d for qemu-devel@nongnu.org; Fri, 29 Aug 2014 12:30:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNP4K-0002oz-2W for qemu-devel@nongnu.org; Fri, 29 Aug 2014 12:30:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45349) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNP4J-0002o1-GA for qemu-devel@nongnu.org; Fri, 29 Aug 2014 12:30:31 -0400 From: Stefan Hajnoczi Date: Fri, 29 Aug 2014 17:29:38 +0100 Message-Id: <1409329803-20744-11-git-send-email-stefanha@redhat.com> In-Reply-To: <1409329803-20744-1-git-send-email-stefanha@redhat.com> References: <1409329803-20744-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 10/35] coroutine: Drop co_sleep_ns List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Fam Zheng , Stefan Hajnoczi From: Fam Zheng block_job_sleep_ns is the only user. Since we are moving towards AioContext aware code, it's better to use the explicit version and drop the old one. Signed-off-by: Fam Zheng Reviewed-by: Beno=C3=AEt Canet Signed-off-by: Stefan Hajnoczi --- 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 =3D 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 b= e * 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); } =20 -void coroutine_fn co_sleep_ns(QEMUClockType type, int64_t ns) -{ - CoSleepCB sleep_cb =3D { - .co =3D qemu_coroutine_self(), - }; - sleep_cb.ts =3D 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) { --=20 1.9.3