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

qapi: Simplify how qmp_dispatch() gets the request ID 



We convert the request object to a QDict twice: first in
qmp_dispatch() to get the request ID, and then again in
qmp_dispatch_check_obj(), which converts to QDict, then checks and
returns it.  We can't get the request ID from the latter, because it's
null when the qdict flunks the checks.

Move the checked conversion to QDict from qmp_dispatch_check_obj() to
qmp_dispatch(), and drop the duplicate there.

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

qapi/qmp-dispatch.c

+12 −11
Original line number Diff line number Diff line
@@ -19,20 +19,13 @@ 
#include "sysemu/runstate.h"

#include "qapi/qmp/qbool.h"



static QDict *qmp_dispatch_check_obj(const QObject *request, bool allow_oob,

static QDict *qmp_dispatch_check_obj(QDict *dict, bool allow_oob,

                                     Error **errp)

{

    const char *exec_key = NULL;

    const QDictEntry *ent;

    const char *arg_name;

    const QObject *arg_obj;

    QDict *dict;



    dict = qobject_to(QDict, request);

    if (!dict) {

        error_setg(errp, "QMP input must be a JSON object");

        return NULL;

    }



    for (ent = qdict_first(dict); ent;

         ent = qdict_next(dict, ent)) {
@@ -103,13 +96,21 @@ QDict *qmp_dispatch(QmpCommandList *cmds, QObject *request, 
    const char *command;

    QDict *args;

    QmpCommand *cmd;

    QDict *dict = qobject_to(QDict, request);

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

    QDict *dict;

    QObject *id;

    QObject *ret = NULL;

    QDict *rsp = NULL;



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

    dict = qobject_to(QDict, request);

    if (!dict) {

        id = NULL;

        error_setg(&err, "QMP input must be a JSON object");

        goto out;

    }



    id = qdict_get(dict, "id");



    if (!qmp_dispatch_check_obj(dict, allow_oob, &err)) {

        goto out;

    }