69240fe62d
handle_qmp_command() reports certain errors right away. This is wrong when OOB is enabled, because the errors can "jump the queue" then, as the previous commit demonstrates. To fix, we need to delay errors until dispatch. Do that for semantic errors, mostly by reverting ill-advised parts of commitcf869d5317"qmp: support out-of-band (oob) execution". Bonus: doesn't run qmp_dispatch_check_obj() twice, once in handle_qmp_command(), and again in do_qmp_dispatch(). That's also due to commitcf869d5317. The next commit will fix queue jumping for syntax errors. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20180703085358.13941-18-armbru@redhat.com>
61 lines
1.8 KiB
C
61 lines
1.8 KiB
C
/*
|
|
* Core Definitions for QAPI/QMP Dispatch
|
|
*
|
|
* Copyright IBM, Corp. 2011
|
|
*
|
|
* Authors:
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
|
* See the COPYING.LIB file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#ifndef QAPI_QMP_DISPATCH_H
|
|
#define QAPI_QMP_DISPATCH_H
|
|
|
|
#include "qemu/queue.h"
|
|
|
|
typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);
|
|
|
|
typedef enum QmpCommandOptions
|
|
{
|
|
QCO_NO_OPTIONS = 0x0,
|
|
QCO_NO_SUCCESS_RESP = (1U << 0),
|
|
QCO_ALLOW_OOB = (1U << 1),
|
|
QCO_ALLOW_PRECONFIG = (1U << 2),
|
|
} QmpCommandOptions;
|
|
|
|
typedef struct QmpCommand
|
|
{
|
|
const char *name;
|
|
QmpCommandFunc *fn;
|
|
QmpCommandOptions options;
|
|
QTAILQ_ENTRY(QmpCommand) node;
|
|
bool enabled;
|
|
} QmpCommand;
|
|
|
|
typedef QTAILQ_HEAD(QmpCommandList, QmpCommand) QmpCommandList;
|
|
|
|
void qmp_register_command(QmpCommandList *cmds, const char *name,
|
|
QmpCommandFunc *fn, QmpCommandOptions options);
|
|
void qmp_unregister_command(QmpCommandList *cmds, const char *name);
|
|
QmpCommand *qmp_find_command(QmpCommandList *cmds, const char *name);
|
|
void qmp_disable_command(QmpCommandList *cmds, const char *name);
|
|
void qmp_enable_command(QmpCommandList *cmds, const char *name);
|
|
|
|
bool qmp_command_is_enabled(const QmpCommand *cmd);
|
|
const char *qmp_command_name(const QmpCommand *cmd);
|
|
bool qmp_has_success_response(const QmpCommand *cmd);
|
|
QObject *qmp_build_error_object(Error *err);
|
|
QObject *qmp_dispatch(QmpCommandList *cmds, QObject *request,
|
|
bool allow_oob);
|
|
bool qmp_is_oob(QDict *dict);
|
|
|
|
typedef void (*qmp_cmd_callback_fn)(QmpCommand *cmd, void *opaque);
|
|
|
|
void qmp_for_each_command(QmpCommandList *cmds, qmp_cmd_callback_fn fn,
|
|
void *opaque);
|
|
|
|
#endif
|