From d93f7283a00872b5c700d2aeaacef195d144289e Mon Sep 17 00:00:00 2001 From: Jeffrey Cody Date: Tue, 20 Mar 2012 14:07:30 -0300 Subject: [RHEL6 qemu-kvm PATCH 10/21] monitor: Allow to exclude commands from QMP RH-Author: Jeffrey Cody Message-id: <34c33bcecbe67f98683a8adb20e29b98fbf28a20.1332249823.git.jcody@redhat.com> Patchwork-id: 38636 O-Subject: [RHEL6.3 qemu-kvm PATCH v3 10/21] monitor: Allow to exclude commands from QMP Bugzilla: 784153 RH-Acked-by: Kevin Wolf RH-Acked-by: Paolo Bonzini RH-Acked-by: Markus Armbruster From: Jan Kiszka Ported commands that are marked 'user_only' will not be considered for QMP monitor sessions. This allows to implement new commands that do not (yet) provide a sufficiently stable interface for QMP use. Signed-off-by: Jan Kiszka Signed-off-by: Luiz Capitulino (cherry picked from commit a6c4d36425871fafc55ce3937bebd05e86f5ea81) Signed-off-by: Jeff Cody --- monitor.c | 18 +++++++++++++++--- monitor.h | 1 + 2 files changed, 16 insertions(+), 3 deletions(-) Signed-off-by: Eduardo Habkost --- monitor.c | 18 +++++++++++++++--- monitor.h | 1 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 2e76e0f..31594ab 100644 --- a/monitor.c +++ b/monitor.c @@ -345,6 +345,11 @@ static inline bool monitor_handler_is_async(const mon_cmd_t *cmd) return cmd->flags & MONITOR_CMD_ASYNC; } +static inline bool monitor_cmd_user_only(const mon_cmd_t *cmd) +{ + return (cmd->flags & MONITOR_CMD_USER_ONLY); +} + static inline int monitor_has_error(const Monitor *mon) { return mon->error != NULL; @@ -696,6 +701,11 @@ static int do_info(Monitor *mon, const QDict *qdict, QObject **ret_data) goto help; } + if (monitor_ctrl_mode(mon) && monitor_cmd_user_only(cmd)) { + qerror_report(QERR_COMMAND_NOT_FOUND, item); + return -1; + } + if (monitor_handler_is_async(cmd)) { if (monitor_ctrl_mode(mon)) { qmp_async_info_handler(mon, cmd); @@ -813,13 +823,14 @@ static void do_info_commands(Monitor *mon, QObject **ret_data) cmd_list = qlist_new(); for (cmd = mon_cmds; cmd->name != NULL; cmd++) { - if (monitor_handler_ported(cmd) && !compare_cmd(cmd->name, "info")) { + if (monitor_handler_ported(cmd) && !monitor_cmd_user_only(cmd) && + !compare_cmd(cmd->name, "info")) { qlist_append_obj(cmd_list, get_cmd_dict(cmd->name)); } } for (cmd = info_cmds; cmd->name != NULL; cmd++) { - if (monitor_handler_ported(cmd)) { + if (monitor_handler_ported(cmd) && !monitor_cmd_user_only(cmd)) { char buf[128]; snprintf(buf, sizeof(buf), "query-%s", cmd->name); qlist_append_obj(cmd_list, get_cmd_dict(buf)); @@ -4710,7 +4721,8 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) qobject_from_jsonf("{ 'item': %s }", info_item)); } else { cmd = monitor_find_command(cmd_name); - if (!cmd || !monitor_handler_ported(cmd)) { + if (!cmd || !monitor_handler_ported(cmd) + || monitor_cmd_user_only(cmd)) { qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name); goto err_out; } diff --git a/monitor.h b/monitor.h index 83bac6a..8db2523 100644 --- a/monitor.h +++ b/monitor.h @@ -20,6 +20,7 @@ extern Monitor *default_mon; /* flags for monitor commands */ #define MONITOR_CMD_ASYNC 0x0001 +#define MONITOR_CMD_USER_ONLY 0x0002 /* QMP events */ typedef enum MonitorEvent { -- 1.7.3.2