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

qapi: Inline do_qmp_dispatch() into qmp_dispatch() 



Both functions check @request is a QDict, and both have code for
QCO_NO_SUCCESS_RESP.  This wasn't the case back when they were
created.  It's a sign of muddled responsibilities.  Inline.  The next
commits will clean up some more.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200317115459.31821-22-armbru@redhat.com>
parent 84ab0086

qapi/qmp-dispatch.c

+41 −49
Original line number Diff line number Diff line
@@ -75,19 +75,42 @@ static QDict *qmp_dispatch_check_obj(const QObject *request, bool allow_oob, 
    return dict;

}



static QObject *do_qmp_dispatch(QmpCommandList *cmds, QObject *request,

                                bool allow_oob, Error **errp)

QDict *qmp_error_response(Error *err)

{

    QDict *rsp;



    rsp = qdict_from_jsonf_nofail("{ 'error': { 'class': %s, 'desc': %s } }",

                                  QapiErrorClass_str(error_get_class(err)),

                                  error_get_pretty(err));

    error_free(err);

    return rsp;

}



/*

 * Does @qdict look like a command to be run out-of-band?

 */

bool qmp_is_oob(const QDict *dict)

{

    Error *local_err = NULL;

    return qdict_haskey(dict, "exec-oob")

        && !qdict_haskey(dict, "execute");

}



QDict *qmp_dispatch(QmpCommandList *cmds, QObject *request,

                    bool allow_oob)

{

    Error *err = NULL;

    bool oob;

    const char *command;

    QDict *args, *dict;

    QDict *args;

    QmpCommand *cmd;

    QDict *dict = qobject_to(QDict, request);

    QObject *id = dict ? qdict_get(dict, "id") : NULL;

    QObject *ret = NULL;

    QDict *rsp;



    dict = qmp_dispatch_check_obj(request, allow_oob, errp);

    dict = qmp_dispatch_check_obj(request, allow_oob, &err);

    if (!dict) {

        return NULL;

        goto out;

    }



    command = qdict_get_try_str(dict, "execute");
@@ -99,27 +122,27 @@ static QObject *do_qmp_dispatch(QmpCommandList *cmds, QObject *request, 
    }

    cmd = qmp_find_command(cmds, command);

    if (cmd == NULL) {

        error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,

        error_set(&err, ERROR_CLASS_COMMAND_NOT_FOUND,

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

        return NULL;

        goto out;

    }

    if (!cmd->enabled) {

        error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,

        error_set(&err, ERROR_CLASS_COMMAND_NOT_FOUND,

                  "The command %s has been disabled for this instance",

                  command);

        return NULL;

        goto out;

    }

    if (oob && !(cmd->options & QCO_ALLOW_OOB)) {

        error_setg(errp, "The command %s does not support OOB",

        error_setg(&err, "The command %s does not support OOB",

                   command);

        return NULL;

        goto out;

    }



    if (runstate_check(RUN_STATE_PRECONFIG) &&

        !(cmd->options & QCO_ALLOW_PRECONFIG)) {

        error_setg(errp, "The command '%s' isn't permitted in '%s' state",

        error_setg(&err, "The command '%s' isn't permitted in '%s' state",

                   cmd->name, RunState_str(RUN_STATE_PRECONFIG));

        return NULL;

        goto out;

    }



    if (!qdict_haskey(dict, "arguments")) {
@@ -129,9 +152,9 @@ static QObject *do_qmp_dispatch(QmpCommandList *cmds, QObject *request, 
        qobject_ref(args);

    }



    cmd->fn(args, &ret, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

    cmd->fn(args, &ret, &err);

    if (err) {

        ;

    } else if (cmd->options & QCO_NO_SUCCESS_RESP) {

        g_assert(!ret);

    } else if (!ret) {
@@ -141,38 +164,7 @@ static QObject *do_qmp_dispatch(QmpCommandList *cmds, QObject *request, 


    qobject_unref(args);



    return ret;

}



QDict *qmp_error_response(Error *err)

{

    QDict *rsp;



    rsp = qdict_from_jsonf_nofail("{ 'error': { 'class': %s, 'desc': %s } }",

                                  QapiErrorClass_str(error_get_class(err)),

                                  error_get_pretty(err));

    error_free(err);

    return rsp;

}



/*

 * Does @qdict look like a command to be run out-of-band?

 */

bool qmp_is_oob(const QDict *dict)

{

    return qdict_haskey(dict, "exec-oob")

        && !qdict_haskey(dict, "execute");

}



QDict *qmp_dispatch(QmpCommandList *cmds, QObject *request,

                    bool allow_oob)

{

    Error *err = NULL;

    QDict *dict = qobject_to(QDict, request);

    QObject *ret, *id = dict ? qdict_get(dict, "id") : NULL;

    QDict *rsp;



    ret = do_qmp_dispatch(cmds, request, allow_oob, &err);

out:

    if (err) {

        rsp = qmp_error_response(err);

    } else if (ret) {