[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 13/17] monitor: Allow to exclude commands from QM
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v3 13/17] monitor: Allow to exclude commands from QMP |
Date: |
Sun, 23 May 2010 12:59:26 +0200 |
From: Jan Kiszka <address@hidden>
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 (e.g.
device_show).
Signed-off-by: Jan Kiszka <address@hidden>
---
monitor.c | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index 6766e49..5768c6e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -114,6 +114,7 @@ typedef struct mon_cmd_t {
MonitorCompletion *cb, void *opaque);
} mhandler;
int async;
+ bool user_only;
} mon_cmd_t;
/* file descriptors passed via SCM_RIGHTS */
@@ -635,6 +636,11 @@ static int do_info(Monitor *mon, const QDict *qdict,
QObject **ret_data)
goto help;
}
+ if (monitor_ctrl_mode(mon) && cmd->user_only) {
+ 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);
@@ -732,13 +738,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) && !cmd->user_only &&
+ !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) && !cmd->user_only) {
char buf[128];
snprintf(buf, sizeof(buf), "query-%s", cmd->name);
qlist_append_obj(cmd_list, get_cmd_dict(buf));
@@ -4416,7 +4423,7 @@ 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) || cmd->user_only) {
qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name);
goto err_input;
}
--
1.6.0.2
- Re: [Qemu-devel] [PATCH v3 04/17] qdev: Give qtree names precedence over user-assigned IDs, (continued)
[Qemu-devel] [PATCH v3 05/17] qdev: Convert device and bus lists to QTAILQ, Jan Kiszka, 2010/05/23
[Qemu-devel] [PATCH v3 01/17] Add dependency of JSON unit tests on config-host.h, Jan Kiszka, 2010/05/23
[Qemu-devel] [PATCH v3 11/17] Add QBuffer, Jan Kiszka, 2010/05/23
[Qemu-devel] [PATCH v3 07/17] qdev: Push QMP mode checks into qbus_list_bus/dev, Jan Kiszka, 2010/05/23
[Qemu-devel] [PATCH v3 08/17] monitor: Add completion for qdev paths, Jan Kiszka, 2010/05/23
[Qemu-devel] [PATCH v3 09/17] Add base64 encoder/decoder, Jan Kiszka, 2010/05/23
[Qemu-devel] [PATCH v3 15/17] QMP: Teach basic capability negotiation to python example, Jan Kiszka, 2010/05/23
[Qemu-devel] [PATCH v3 13/17] monitor: Allow to exclude commands from QMP,
Jan Kiszka <=
[Qemu-devel] [PATCH v3 12/17] monitor: return length of printed string via monitor_[v]printf, Jan Kiszka, 2010/05/23
[Qemu-devel] [PATCH v3 16/17] QMP: Fix python helper /wrt long return strings, Jan Kiszka, 2010/05/23
[Qemu-devel] [PATCH v3 10/17] QMP: Reserve namespace for complex object classes, Jan Kiszka, 2010/05/23