summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorPeter Maydell2016-09-28 21:13:05 +0200
committerPeter Maydell2016-09-28 21:13:05 +0200
commitbc63afaf5f6d906ff56608b52d575ac8dbb09062 (patch)
tree3f727bcf3ffd719f04aa15e3059ff5851aa40f57 /util
parentMerge remote-tracking branch 'remotes/kraxel/tags/pull-input-20160928-1' into... (diff)
parentlinux-aio: fix re-entrant completion processing (diff)
downloadqemu-bc63afaf5f6d906ff56608b52d575ac8dbb09062.tar.gz
qemu-bc63afaf5f6d906ff56608b52d575ac8dbb09062.tar.xz
qemu-bc63afaf5f6d906ff56608b52d575ac8dbb09062.zip
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Wed 28 Sep 2016 19:15:22 BST # gpg: using RSA key 0x9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/block-pull-request: linux-aio: fix re-entrant completion processing test-coroutine: test qemu_coroutine_entered() coroutine: add qemu_coroutine_entered() function libqos: fix qvring_init() iothread: check iothread->ctx before aio_context_unref to avoid assertion aio-posix: avoid unnecessary aio_epoll_enabled() calls block: mirror: fix wrong comment of mirror_start Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
-rw-r--r--util/qemu-coroutine.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/util/qemu-coroutine.c b/util/qemu-coroutine.c
index 3cbf225487..737bffa984 100644
--- a/util/qemu-coroutine.c
+++ b/util/qemu-coroutine.c
@@ -146,3 +146,8 @@ void coroutine_fn qemu_coroutine_yield(void)
self->caller = NULL;
qemu_coroutine_switch(self, to, COROUTINE_YIELD);
}
+
+bool qemu_coroutine_entered(Coroutine *co)
+{
+ return co->caller;
+}