diff options
author | Peter Maydell | 2018-03-27 18:11:33 +0200 |
---|---|---|
committer | Peter Maydell | 2018-03-27 18:11:33 +0200 |
commit | 6cf38cbf2961c57bd85022cf9adf7ef85dae0f02 (patch) | |
tree | 834a4d30e1dc544b425d52dd429f2191b99539c9 /monitor.c | |
parent | Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging (diff) | |
parent | MAINTAINERS: add include/block/aio-wait.h (diff) | |
download | qemu-6cf38cbf2961c57bd85022cf9adf7ef85dae0f02.tar.gz qemu-6cf38cbf2961c57bd85022cf9adf7ef85dae0f02.tar.xz qemu-6cf38cbf2961c57bd85022cf9adf7ef85dae0f02.zip |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Tue 27 Mar 2018 15:41:11 BST
# gpg: using RSA key 9CA4ABB381AB73C8
# 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:
MAINTAINERS: add include/block/aio-wait.h
coroutine: add test-aio coroutine queue chaining test case
coroutine: avoid co_queue_wakeup recursion
queue: add QSIMPLEQ_PREPEND()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'monitor.c')
0 files changed, 0 insertions, 0 deletions