diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-09-24 15:43:33 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-09-24 15:43:33 +0100 |
| commit | efd1d5229fbf09f2ef535df024ccaa620a013f86 (patch) | |
| tree | 73762a032ab44235edd0a8e1ef3abaf19f3838d7 /include/qapi | |
| parent | d6f71af65410d3e003ba331c5e57eddcf716cbcf (diff) | |
| parent | 176160ce78b58f29d765ddace885e88a732df34a (diff) | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2018-09-01' into staging
Monitor patches for 2018-09-01
# gpg: Signature made Sat 01 Sep 2018 12:06:52 BST
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-monitor-2018-09-01:
monitor: no need to save need_resume
Revert "qmp: isolate responses into io thread"
qmp: constify qmp_is_oob()
monitor: consitify qmp_send_response() QDict argument
monitor: accept input on resume
monitor: simplify monitor_qmp_setup_handlers_bh
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qapi')
| -rw-r--r-- | include/qapi/qmp/dispatch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h index 4e2e749faf..68a528a9aa 100644 --- a/include/qapi/qmp/dispatch.h +++ b/include/qapi/qmp/dispatch.h @@ -50,7 +50,7 @@ bool qmp_has_success_response(const QmpCommand *cmd); QDict *qmp_error_response(Error *err); QDict *qmp_dispatch(QmpCommandList *cmds, QObject *request, bool allow_oob); -bool qmp_is_oob(QDict *dict); +bool qmp_is_oob(const QDict *dict); typedef void (*qmp_cmd_callback_fn)(QmpCommand *cmd, void *opaque); |