From 09069b19f49311c772e220b44edb19fdd446ba5f Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Thu, 4 Feb 2010 18:10:06 -0200 Subject: [PATCH] QMP: Enforce capability negotiation rules With this commit QMP will be started in Capabilities Negotiation mode, where the only command allowed to run is 'qmp_capabilities'. All other commands will return CommandNotFound error. Asynchronous messages are not delivered either. When 'qmp_capabilities' is successfully executed QMP enters in Command mode, where all commands (except 'qmp_capabilities') are allowed to run and asynchronous messages are delivered. Signed-off-by: Luiz Capitulino Signed-off-by: Anthony Liguori --- monitor.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/monitor.c b/monitor.c index 823fb0ca89..6a0f182647 100644 --- a/monitor.c +++ b/monitor.c @@ -153,6 +153,11 @@ Monitor *cur_mon = NULL; static void monitor_command_cb(Monitor *mon, const char *cmdline, void *opaque); +static inline int qmp_cmd_mode(const Monitor *mon) +{ + return (mon->mc ? mon->mc->command_mode : 0); +} + /* Return true if in control mode, false otherwise */ static inline int monitor_ctrl_mode(const Monitor *mon) { @@ -406,7 +411,7 @@ void monitor_protocol_event(MonitorEvent event, QObject *data) } QLIST_FOREACH(mon, &mon_list, entry) { - if (monitor_ctrl_mode(mon)) { + if (monitor_ctrl_mode(mon) && qmp_cmd_mode(mon)) { monitor_json_emitter(mon, QOBJECT(qmp)); } } @@ -4232,6 +4237,12 @@ static int monitor_check_qmp_args(const mon_cmd_t *cmd, QDict *args) return err; } +static int invalid_qmp_mode(const Monitor *mon, const char *cmd_name) +{ + int is_cap = compare_cmd(cmd_name, "qmp_capabilities"); + return (qmp_cmd_mode(mon) ? is_cap : !is_cap); +} + static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) { int err; @@ -4271,6 +4282,11 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) cmd_name = qstring_get_str(qobject_to_qstring(obj)); + if (invalid_qmp_mode(mon, cmd_name)) { + qemu_error_new(QERR_COMMAND_NOT_FOUND, cmd_name); + goto err_input; + } + /* * XXX: We need this special case until we get info handlers * converted into 'query-' commands -- GitLab