diff options
| author | Benoît Canet <benoit@irqsave.net> | 2013-07-26 22:39:22 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2013-07-29 17:07:37 +0200 |
| commit | b681a1c73e15e08c70c10cccd9c9f5b65cca12e8 (patch) | |
| tree | c45ec2924cb5aae1e5cb1b23ac9cdcaf6591741a /include | |
| parent | 42ec24e2851674e0899f71933e0d7d9125f31d76 (diff) | |
| download | qemu-b681a1c73e15e08c70c10cccd9c9f5b65cca12e8.tar.gz | |
block: Repair the throttling code.
The throttling code was segfaulting since commit
02ffb504485f0920cfc75a0982a602f824a9a4f4 because some qemu_co_queue_next caller
does not run in a coroutine.
qemu_co_queue_do_restart assume that the caller is a coroutinne.
As suggested by Stefan fix this by entering the coroutine directly.
Also make sure like suggested that qemu_co_queue_next() and
qemu_co_queue_restart_all() can be called only in coroutines.
Signed-off-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/coroutine.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/block/coroutine.h b/include/block/coroutine.h index 377805a3b0..1f2db3e8a4 100644 --- a/include/block/coroutine.h +++ b/include/block/coroutine.h @@ -130,12 +130,17 @@ void coroutine_fn qemu_co_queue_wait_insert_head(CoQueue *queue); * * Returns true if a coroutine was restarted, false if the queue is empty. */ -bool qemu_co_queue_next(CoQueue *queue); +bool coroutine_fn qemu_co_queue_next(CoQueue *queue); /** * Restarts all coroutines in the CoQueue and leaves the queue empty. */ -void qemu_co_queue_restart_all(CoQueue *queue); +void coroutine_fn qemu_co_queue_restart_all(CoQueue *queue); + +/** + * Enter the next coroutine in the queue + */ +bool qemu_co_enter_next(CoQueue *queue); /** * Checks if the CoQueue is empty. |