mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qmp-dispatch: Use CommandNotFound error for disabled commands

Browse Source 
If a command is disabled an error is reported.  But due to usage of
error_setg() the class of the error is GenericError which does not
help callers in distinguishing this case from a case where a qmp
command fails regularly due to other reasons.

We used to use class CommandDisabled until the great error
simplification (commit de253f1491 for QMP and commit 93b91c59db for
qemu-ga, both v1.2.0).

Use CommandNotFound error class, which is close enough.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Message-Id: <faeb030e6a1044f0fd88208edfdb1c5fafe5def9.1567171655.git.mprivozn@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[Test update squashed in, commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Michal Privoznik 2019-08-30 15:29:45 +02:00 committed by Markus Armbruster
parent c6f5012ba5
commit 2546be1c85
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qapi/qmp-dispatch.c
View File

@ -104,8 +104,9 @@ static QObject *do_qmp_dispatch(QmpCommandList *cmds, QObject *request,
return NULL; return NULL;
} }
if (!cmd->enabled) { if (!cmd->enabled) {
error_setg(errp, "The command %s has been disabled for this instance", error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
command); "The command %s has been disabled for this instance",
command);
return NULL; return NULL;
} }
if (oob && !(cmd->options & QCO_ALLOW_OOB)) { if (oob && !(cmd->options & QCO_ALLOW_OOB)) {

4
tests/test-qga.c
View File

@ -668,7 +668,7 @@ static void test_qga_blacklist(gconstpointer data)
error = qdict_get_qdict(ret, "error"); error = qdict_get_qdict(ret, "error");
class = qdict_get_try_str(error, "class"); class = qdict_get_try_str(error, "class");
desc = qdict_get_try_str(error, "desc"); desc = qdict_get_try_str(error, "desc");
g_assert_cmpstr(class, ==, "GenericError"); g_assert_cmpstr(class, ==, "CommandNotFound");
g_assert_nonnull(g_strstr_len(desc, -1, "has been disabled")); g_assert_nonnull(g_strstr_len(desc, -1, "has been disabled"));
qobject_unref(ret); qobject_unref(ret);
@ -677,7 +677,7 @@ static void test_qga_blacklist(gconstpointer data)
error = qdict_get_qdict(ret, "error"); error = qdict_get_qdict(ret, "error");
class = qdict_get_try_str(error, "class"); class = qdict_get_try_str(error, "class");
desc = qdict_get_try_str(error, "desc"); desc = qdict_get_try_str(error, "desc");
g_assert_cmpstr(class, ==, "GenericError"); g_assert_cmpstr(class, ==, "CommandNotFound");
g_assert_nonnull(g_strstr_len(desc, -1, "has been disabled")); g_assert_nonnull(g_strstr_len(desc, -1, "has been disabled"));
qobject_unref(ret); qobject_unref(ret);