diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-04 16:52:17 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-04 16:52:17 +0000 |
| commit | 3c8c36c9087da957f580a9bb5ebf7814a753d1c6 (patch) | |
| tree | c17bef018eab22d85064092af77c807ace9bdb10 /util | |
| parent | b1266b6ee5aecb8f14db1a1e43109b8ecae6131a (diff) | |
| parent | 0d9b90ce5c73505648909a89bcd5272081b9c348 (diff) | |
| download | qemu-3c8c36c9087da957f580a9bb5ebf7814a753d1c6.zip qemu-3c8c36c9087da957f580a9bb5ebf7814a753d1c6.tar.gz qemu-3c8c36c9087da957f580a9bb5ebf7814a753d1c6.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20201104-pull-request' into staging
ui: run screendump in coroutine
# gpg: Signature made Wed 04 Nov 2020 13:53:50 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20201104-pull-request:
console: make QMP/HMP screendump run in coroutine
console: modify ppm_save to take a pixman image ref
coroutine: let CoQueue wake up outside a coroutine
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/qemu-coroutine-lock.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/util/qemu-coroutine-lock.c b/util/qemu-coroutine-lock.c index 36927b5..5816bf8 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); } |