diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-02-05 11:11:56 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-02-05 11:11:56 +0000 |
| commit | 2c918a245ca2a0b3339b8ded926b3f887d6d409e (patch) | |
| tree | 99730f909f4446a5f5390731a78cf2e1e6536831 /qapi/qmp-dispatch.c | |
| parent | 32193cb421cecb98b48715e0740b2d948cda0779 (diff) | |
| parent | 2ad28a088d2cc8fd404dfa58fa1b80f9225425ff (diff) | |
| download | focaccia-qemu-2c918a245ca2a0b3339b8ded926b3f887d6d409e.tar.gz focaccia-qemu-2c918a245ca2a0b3339b8ded926b3f887d6d409e.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-02-05' into staging
qmp hmp balloon: Cleanups around error reporting # gpg: Signature made Thu 05 Feb 2015 07:15:11 GMT using RSA key ID EB918653 # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" * remotes/armbru/tags/pull-error-2015-02-05: balloon: Eliminate silly QERR_ macros balloon: Factor out common "is balloon active" test balloon: Inline qemu_balloon(), qemu_balloon_status() qmp: Eliminate silly QERR_COMMAND_NOT_FOUND macro qmp: Simplify recognition of capability negotiation command qmp: Clean up qmp_query_spice() #ifndef !CONFIG_SPICE dummy hmp: Compile hmp_info_spice() only with CONFIG_SPICE qmp hmp: Improve error messages when SPICE is not in use qmp hmp: Factor out common "using spice" test Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi/qmp-dispatch.c')
| -rw-r--r-- | qapi/qmp-dispatch.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c index 168b083c87..222742013f 100644 --- a/qapi/qmp-dispatch.c +++ b/qapi/qmp-dispatch.c @@ -76,7 +76,8 @@ static QObject *do_qmp_dispatch(QObject *request, Error **errp) command = qdict_get_str(dict, "execute"); cmd = qmp_find_command(command); if (cmd == NULL) { - error_set(errp, QERR_COMMAND_NOT_FOUND, command); + error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND, + "The command %s has not been found", command); return NULL; } if (!cmd->enabled) { |