summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMarc-André Lureau2020-10-27 14:36:00 +0100
committerGerd Hoffmann2020-11-04 08:02:24 +0100
commite18d9a9687ff0c30b70ee0a694d9fcf9333cd844 (patch)
tree3422b02107a062294abb37484f978852dbb9609c /util
parentUpdate version for v5.2.0-rc0 release (diff)
downloadqemu-e18d9a9687ff0c30b70ee0a694d9fcf9333cd844.tar.gz
qemu-e18d9a9687ff0c30b70ee0a694d9fcf9333cd844.tar.xz
qemu-e18d9a9687ff0c30b70ee0a694d9fcf9333cd844.zip
coroutine: let CoQueue wake up outside a coroutine
The assert() was added in commit b681a1c73e15 ("block: Repair the throttling code."), when the qemu_co_queue_do_restart() function required to be running in a coroutine. It was later made unnecessary in commit a9d9235567e7 ("coroutine-lock: reschedule coroutine on the AioContext it was running on"). Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20201027133602.3038018-2-marcandre.lureau@redhat.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'util')
-rw-r--r--util/qemu-coroutine-lock.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/util/qemu-coroutine-lock.c b/util/qemu-coroutine-lock.c
index 36927b5f88..5816bf8900 100644
--- a/util/qemu-coroutine-lock.c
+++ b/util/qemu-coroutine-lock.c
@@ -85,15 +85,13 @@ static bool qemu_co_queue_do_restart(CoQueue *queue, bool single)
return true;
}
-bool coroutine_fn qemu_co_queue_next(CoQueue *queue)
+bool qemu_co_queue_next(CoQueue *queue)
{
- assert(qemu_in_coroutine());
return qemu_co_queue_do_restart(queue, true);
}
-void coroutine_fn qemu_co_queue_restart_all(CoQueue *queue)
+void qemu_co_queue_restart_all(CoQueue *queue)
{
- assert(qemu_in_coroutine());
qemu_co_queue_do_restart(queue, false);
}