diff options
| author | Peter Maydell | 2018-04-10 23:16:19 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-04-10 23:16:19 +0200 |
| commit | 26d6a7c87b05017ffabffb5e16837a0fccf67e90 (patch) | |
| tree | 802fcece5cbe575f0d6bac29cc359e46fffad6c4 /monitor.c | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.12-20180410' int... (diff) | |
| parent | monitor: bind dispatch bh to iohandler context (diff) | |
| download | qemu-26d6a7c87b05017ffabffb5e16837a0fccf67e90.tar.gz qemu-26d6a7c87b05017ffabffb5e16837a0fccf67e90.tar.xz qemu-26d6a7c87b05017ffabffb5e16837a0fccf67e90.zip | |
Merge remote-tracking branch 'remotes/ericb/tags/pull-qapi-2018-04-10' into staging
qapi patches for 2018-04-10
- Peter Xu: iotests: fix wait_until_completed()
- Peter Xu: iothread: workaround glib bug which hangs qmp-test
- Peter Xu: monitor: bind dispatch bh to iohandler context
# gpg: Signature made Tue 10 Apr 2018 14:15:09 BST
# gpg: using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>"
# gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
# gpg: aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A
* remotes/ericb/tags/pull-qapi-2018-04-10:
monitor: bind dispatch bh to iohandler context
iothread: workaround glib bug which hangs qmp-test
iotests: fix wait_until_completed()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4467,7 +4467,7 @@ static void monitor_iothread_init(void) * have assumption to be run on main loop thread. It would be * nice that one day we can remove this assumption in the future. */ - mon_global.qmp_dispatcher_bh = aio_bh_new(qemu_get_aio_context(), + mon_global.qmp_dispatcher_bh = aio_bh_new(iohandler_get_aio_context(), monitor_qmp_bh_dispatcher, NULL); |