[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/20] monitor: Fix do_info_commands() output
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 06/20] monitor: Fix do_info_commands() output |
Date: |
Thu, 10 Dec 2009 17:15:56 -0200 |
Should return a QDict and should not print the user protocol bits
(eg. "c|cont").
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index aa56ec7..5010ce4 100644
--- a/monitor.c
+++ b/monitor.c
@@ -518,10 +518,34 @@ static void do_info_name(Monitor *mon)
monitor_printf(mon, "%s\n", qemu_name);
}
+static QObject *get_cmd_dict(const char *name)
+{
+ const char *p;
+
+ /* Remove '|' from some commands */
+ p = strchr(name, '|');
+ if (p) {
+ p++;
+ } else {
+ p = name;
+ }
+
+ return qobject_from_jsonf("{ 'name': %s }", p);
+}
+
/**
* do_info_commands(): List QMP available commands
*
- * Return a QList of QStrings.
+ * Each command is represented by a QDict, the returned QObject is a QList
+ * of all commands.
+ *
+ * The QDict contains:
+ *
+ * - "name": command's name
+ *
+ * Example:
+ *
+ * { [ { "name": "query-balloon" }, { "name": "system_powerdown" } ] }
*/
static void do_info_commands(Monitor *mon, QObject **ret_data)
{
@@ -532,7 +556,7 @@ static void do_info_commands(Monitor *mon, QObject
**ret_data)
for (cmd = mon_cmds; cmd->name != NULL; cmd++) {
if (monitor_handler_ported(cmd) && !compare_cmd(cmd->name, "info")) {
- qlist_append(cmd_list, qstring_from_str(cmd->name));
+ qlist_append_obj(cmd_list, get_cmd_dict(cmd->name));
}
}
@@ -540,7 +564,7 @@ static void do_info_commands(Monitor *mon, QObject
**ret_data)
if (monitor_handler_ported(cmd)) {
char buf[128];
snprintf(buf, sizeof(buf), "query-%s", cmd->name);
- qlist_append(cmd_list, qstring_from_str(buf));
+ qlist_append_obj(cmd_list, get_cmd_dict(buf));
}
}
--
1.6.6.rc1.39.g9a42
- [Qemu-devel] [FOR 0.12 v5 00/20]: info handlers conversions to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 01/20] Introduce qemu-objects.h header file, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 02/20] Makefile: move QObject objs to their own entry, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 03/20] QDict: Introduce qdict_get_qbool(), Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 04/20] QDict: Introduce qdict_get_qlist(), Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 05/20] monitor: Fix do_info_balloon() output, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 06/20] monitor: Fix do_info_commands() output,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 07/20] monitor: do_info_cpus(): Use QBool, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 08/20] monitor: do_info_version(): Use QDict, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 09/20] monitor: Convert do_info_status() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 10/20] monitor: Convert do_info_kvm() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 11/20] monitor: Convert do_info_name() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 13/20] monitor: Convert do_info_uuid() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 12/20] monitor: Convert do_info_hpet() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 14/20] monitor: Convert do_info_mice() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 15/20] migration: Convert do_info_migrate() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 16/20] block: Convert bdrv_info() to QObject, Luiz Capitulino, 2009/12/10