Commit a6c90cbc authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qmp: Eliminate silly QERR_COMMAND_NOT_FOUND macro 



The QERR_ macros are leftovers from the days of "rich" error objects.
They're used with error_set() and qerror_report(), and expand into the
first *two* arguments.  This trickiness has become pointless.  Clean
this one up.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent bb5224ed

include/qapi/qmp/qerror.h

+0 −3
Original line number Diff line number Diff line
@@ -52,9 +52,6 @@ void qerror_report_err(Error *err); 
#define QERR_BUS_NOT_FOUND \

    ERROR_CLASS_GENERIC_ERROR, "Bus '%s' not found"



#define QERR_COMMAND_NOT_FOUND \

    ERROR_CLASS_COMMAND_NOT_FOUND, "The command %s has not been found"



#define QERR_DEVICE_ENCRYPTED \

    ERROR_CLASS_DEVICE_ENCRYPTED, "'%s' (%s) is encrypted"

monitor.c

+2 −1
Original line number Diff line number Diff line
@@ -5081,7 +5081,8 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) 
    trace_handle_qmp_command(mon, cmd_name);

    cmd = qmp_find_cmd(cmd_name);

    if (!cmd || invalid_qmp_mode(mon, cmd)) {

        qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name);

        qerror_report(ERROR_CLASS_COMMAND_NOT_FOUND,

                      "The command %s has not been found", cmd_name);

        goto err_out;

    }

qapi/qmp-dispatch.c

+2 −1
Original line number Diff line number Diff line
@@ -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) {