@@ -38,10 +38,12 @@ typedef struct QmpCommand
typedef QTAILQ_HEAD(QmpCommandList, QmpCommand) QmpCommandList;
typedef struct QmpSession QmpSession;
+typedef void (QmpDispatch) (QmpSession *session, QDict *request);
typedef void (QmpDispatchReturn) (QmpSession *session, QDict *rsp);
struct QmpSession {
JSONMessageParser parser;
+ QmpDispatch *dispatch_cb;
QmpDispatchReturn *return_cb;
QmpCommandList *cmds;
};
@@ -52,7 +54,9 @@ void qmp_unregister_command(QmpCommandList *cmds, const char *name);
QmpCommand *qmp_find_command(QmpCommandList *cmds, const char *name);
void qmp_session_init(QmpSession *session,
- QmpCommandList *cmds, QmpDispatchReturn *return_cb);
+ QmpCommandList *cmds,
+ QmpDispatch *dispatch_cb,
+ QmpDispatchReturn *return_cb);
static inline void
qmp_session_feed(QmpSession *session, const char *buf, size_t count)
@@ -4216,7 +4216,9 @@ static void monitor_qmp_event(void *opaque, int event)
switch (event) {
case CHR_EVENT_OPENED:
qmp_session_init(&mon->qmp.session,
- &qmp_cap_negotiation_commands, dispatch_return_cb);
+ &qmp_cap_negotiation_commands,
+ NULL, /* XXX: not in use yet, but in following patch */
+ dispatch_return_cb);
monitor_qmp_caps_reset(mon);
data = get_qmp_greeting(mon);
monitor_json_emitter(mon, data);
@@ -163,7 +163,7 @@ static void qmp_json_parser_emit(JSONMessageParser *parser, GQueue *tokens)
goto end;
}
- qmp_dispatch(session, req);
+ session->dispatch_cb(session, req);
end:
if (err) {
@@ -177,13 +177,16 @@ end:
}
void qmp_session_init(QmpSession *session,
- QmpCommandList *cmds, QmpDispatchReturn *return_cb)
+ QmpCommandList *cmds,
+ QmpDispatch *dispatch_cb,
+ QmpDispatchReturn *return_cb)
{
assert(return_cb);
assert(!session->return_cb);
json_message_parser_init(&session->parser, qmp_json_parser_emit);
session->cmds = cmds;
+ session->dispatch_cb = dispatch_cb;
session->return_cb = return_cb;
}
@@ -194,6 +197,7 @@ void qmp_session_destroy(QmpSession *session)
}
session->cmds = NULL;
+ session->dispatch_cb = NULL;
session->return_cb = NULL;
json_message_parser_destroy(&session->parser);
}
@@ -1270,7 +1270,7 @@ static int run_agent(GAState *s, GAConfig *config, int socket_activation)
s->command_state = ga_command_state_new();
ga_command_state_init(s, s->command_state);
ga_command_state_init_all(s->command_state);
- qmp_session_init(&s->session, &ga_commands, dispatch_return_cb);
+ qmp_session_init(&s->session, &ga_commands, qmp_dispatch, dispatch_return_cb);
#ifndef _WIN32
if (!register_signal_handlers()) {
g_critical("failed to register signal handlers");
@@ -105,7 +105,7 @@ static void test_dispatch_cmd(void)
QmpSession session = { 0, };
QDict *req = qdict_new();
- qmp_session_init(&session, &qmp_commands, dispatch_cmd_return);
+ qmp_session_init(&session, &qmp_commands, qmp_dispatch, dispatch_cmd_return);
qdict_put_str(req, "execute", "user_def_cmd");
qmp_dispatch(&session, req);
QDECREF(req);
@@ -125,7 +125,8 @@ static void test_dispatch_cmd_failure(void)
QDict *req = qdict_new();
QDict *args = qdict_new();
- qmp_session_init(&session, &qmp_commands, dispatch_cmd_failure_return);
+ qmp_session_init(&session, &qmp_commands, qmp_dispatch,
+ dispatch_cmd_failure_return);
qdict_put_str(req, "execute", "user_def_cmd2");
qmp_dispatch(&session, req);
QDECREF(req);
@@ -147,7 +148,8 @@ static void test_dispatch_cmd_success_response(void)
QmpSession session = { 0, };
QDict *req = qdict_new();
- qmp_session_init(&session, &qmp_commands, (QmpDispatchReturn *)abort);
+ qmp_session_init(&session, &qmp_commands, qmp_dispatch,
+ (QmpDispatchReturn *)abort);
qdict_put_str(req, "execute", "cmd-success-response");
qmp_dispatch(&session, req);
QDECREF(req);
@@ -166,7 +168,7 @@ static QObject *test_qmp_dispatch(QDict *req)
QmpSession session = { 0, };
QObject *ret;
- qmp_session_init(&session, &qmp_commands, dispatch_return);
+ qmp_session_init(&session, &qmp_commands, qmp_dispatch, dispatch_return);
qmp_dispatch(&session, req);
ret = dispatch_ret;
dispatch_ret = NULL;
@@ -299,7 +301,7 @@ static void test_dispatch_cmd_id(void)
QmpSession session = { 0, };
QDict *req = qdict_new();
- qmp_session_init(&session, &qmp_commands, dispatch_return_id42);
+ qmp_session_init(&session, &qmp_commands, qmp_dispatch, dispatch_return_id42);
qdict_put_str(req, "execute", "user_def_cmd");
qdict_put_str(req, "id", "ID42");
qmp_dispatch(&session, req);
In order to accomodate for QEMU monitor needs, allow to customize dispatching after JSON parsing. The default (for QGA and tests) can be simply qmp_dispatch(). Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- include/qapi/qmp/dispatch.h | 6 +++++- monitor.c | 4 +++- qapi/qmp-dispatch.c | 8 ++++++-- qga/main.c | 2 +- tests/test-qmp-cmds.c | 12 +++++++----- 5 files changed, 22 insertions(+), 10 deletions(-)