diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-07-03 10:53:37 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-07-03 23:18:56 +0200 |
| commit | 674ed7228f03150d15703961ea2a59cd744f3beb (patch) | |
| tree | ed42dce070bd3934e6b9358d1391e29a0be3ff03 /tests/test-qmp-cmds.c | |
| parent | d4d7ed731ce47d10ea2a17d663cec42fc0c7d925 (diff) | |
| download | qemu-674ed7228f03150d15703961ea2a59cd744f3beb.zip qemu-674ed7228f03150d15703961ea2a59cd744f3beb.tar.gz qemu-674ed7228f03150d15703961ea2a59cd744f3beb.tar.bz2 | |
qmp qemu-ga: Fix qemu-ga not to accept "control"
Commit cf869d53172 "qmp: support out-of-band (oob) execution"
accidentally made qemu-ga accept and ignore "control". Fix that.
Out-of-band execution in a monitor that doesn't support it now fails
with
{"error": {"class": "GenericError", "desc": "QMP input member 'control' is unexpected"}}
instead of
{"error": {"class": "GenericError", "desc": "Please enable out-of-band first for the session during capabilities negotiation"}}
The old description is suboptimal when out-of-band cannot not be
enabled, or the command doesn't support out-of-band execution.
The new description is a bit unspecific, but it'll do.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180703085358.13941-12-armbru@redhat.com>
Diffstat (limited to 'tests/test-qmp-cmds.c')
| -rw-r--r-- | tests/test-qmp-cmds.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/test-qmp-cmds.c b/tests/test-qmp-cmds.c index 491b0c4..10c7ba4 100644 --- a/tests/test-qmp-cmds.c +++ b/tests/test-qmp-cmds.c @@ -102,7 +102,7 @@ static void test_dispatch_cmd(void) qdict_put_str(req, "execute", "user_def_cmd"); - resp = qmp_dispatch(&qmp_commands, QOBJECT(req)); + resp = qmp_dispatch(&qmp_commands, QOBJECT(req), false); assert(resp != NULL); assert(!qdict_haskey(qobject_to(QDict, resp), "error")); @@ -119,7 +119,7 @@ static void test_dispatch_cmd_failure(void) qdict_put_str(req, "execute", "user_def_cmd2"); - resp = qmp_dispatch(&qmp_commands, QOBJECT(req)); + resp = qmp_dispatch(&qmp_commands, QOBJECT(req), false); assert(resp != NULL); assert(qdict_haskey(qobject_to(QDict, resp), "error")); @@ -133,7 +133,7 @@ static void test_dispatch_cmd_failure(void) qdict_put_str(req, "execute", "user_def_cmd"); - resp = qmp_dispatch(&qmp_commands, QOBJECT(req)); + resp = qmp_dispatch(&qmp_commands, QOBJECT(req), false); assert(resp != NULL); assert(qdict_haskey(qobject_to(QDict, resp), "error")); @@ -147,7 +147,7 @@ static QObject *test_qmp_dispatch(QDict *req) QDict *resp; QObject *ret; - resp_obj = qmp_dispatch(&qmp_commands, QOBJECT(req)); + resp_obj = qmp_dispatch(&qmp_commands, QOBJECT(req), false); assert(resp_obj); resp = qobject_to(QDict, resp_obj); assert(resp && !qdict_haskey(resp, "error")); |