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

qmp: Drop dead command->type

Browse Source 
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: Eric Blake <eblake@redhat.com>
Message-Id: <1461879932-9020-4-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2016-04-28 15:45:11 -06:00 committed by Markus Armbruster
parent e58d695e6c
commit 42a502a7a6
3 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/qapi/qmp/dispatch.h
View File

@ -19,11 +19,6 @@
typedef void (QmpCommandFunc)(QDict *, QObject **, Error **); typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);
typedef enum QmpCommandType
{
QCT_NORMAL,
} QmpCommandType;
typedef enum QmpCommandOptions typedef enum QmpCommandOptions
{ {
QCO_NO_OPTIONS = 0x0, QCO_NO_OPTIONS = 0x0,
@ -33,7 +28,6 @@ typedef enum QmpCommandOptions
typedef struct QmpCommand typedef struct QmpCommand
{ {
const char *name; const char *name;
QmpCommandType type;
QmpCommandFunc *fn; QmpCommandFunc *fn;
QmpCommandOptions options; QmpCommandOptions options;
QTAILQ_ENTRY(QmpCommand) node; QTAILQ_ENTRY(QmpCommand) node;

18
qapi/qmp-dispatch.c
View File

@ -94,17 +94,13 @@ static QObject *do_qmp_dispatch(QObject *request, Error **errp)
QINCREF(args); QINCREF(args);
} }
switch (cmd->type) { cmd->fn(args, &ret, &local_err);
case QCT_NORMAL: if (local_err) {
cmd->fn(args, &ret, &local_err); error_propagate(errp, local_err);
if (local_err) { } else if (cmd->options & QCO_NO_SUCCESS_RESP) {
error_propagate(errp, local_err); g_assert(!ret);
} else if (cmd->options & QCO_NO_SUCCESS_RESP) { } else if (!ret) {
g_assert(!ret); ret = QOBJECT(qdict_new());
} else if (!ret) {
ret = QOBJECT(qdict_new());
}
break;
} }
QDECREF(args); QDECREF(args);

1
qapi/qmp-registry.c
View File

@ -25,7 +25,6 @@ void qmp_register_command(const char *name, QmpCommandFunc *fn,
QmpCommand *cmd = g_malloc0(sizeof(*cmd)); QmpCommand *cmd = g_malloc0(sizeof(*cmd));
cmd->name = name; cmd->name = name;
cmd->type = QCT_NORMAL;
cmd->fn = fn; cmd->fn = fn;
cmd->enabled = true; cmd->enabled = true;
cmd->options = options; cmd->options = options;