Commit 42a502a7 authored by Eric Blake's avatar Eric Blake Committed by Markus Armbruster
Browse files

qmp: Drop dead command->type 



Ever since QMP was first added back in commit 43c20a43, we have
never had any QmpCommandType other than QCT_NORMAL.  It's
pointless to carry around the cruft.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <1461879932-9020-4-git-send-email-eblake@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent e58d695e

include/qapi/qmp/dispatch.h

+0 −6
Original line number Diff line number Diff line
@@ -19,11 +19,6 @@ 


typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);



typedef enum QmpCommandType

{

    QCT_NORMAL,

} QmpCommandType;



typedef enum QmpCommandOptions

{

    QCO_NO_OPTIONS = 0x0,
@@ -33,7 +28,6 @@ typedef enum QmpCommandOptions 
typedef struct QmpCommand

{

    const char *name;

    QmpCommandType type;

    QmpCommandFunc *fn;

    QmpCommandOptions options;

    QTAILQ_ENTRY(QmpCommand) node;

qapi/qmp-dispatch.c

+7 −11
Original line number Diff line number Diff line
@@ -94,8 +94,6 @@ static QObject *do_qmp_dispatch(QObject *request, Error **errp) 
        QINCREF(args);

    }



    switch (cmd->type) {

    case QCT_NORMAL:

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

    if (local_err) {

        error_propagate(errp, local_err);
@@ -104,8 +102,6 @@ static QObject *do_qmp_dispatch(QObject *request, Error **errp) 
    } else if (!ret) {

        ret = QOBJECT(qdict_new());

    }

        break;

    }



    QDECREF(args);

qapi/qmp-registry.c

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ void qmp_register_command(const char *name, QmpCommandFunc *fn, 
    QmpCommand *cmd = g_malloc0(sizeof(*cmd));



    cmd->name = name;

    cmd->type = QCT_NORMAL;

    cmd->fn = fn;

    cmd->enabled = true;

    cmd->options = options;