mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor: Fix do_info_commands() output

Browse Source 
Should return a QDict and should not print the user protocol bits
(eg. "c|cont").

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Luiz Capitulino 2009-12-10 17:15:56 -02:00 committed by Anthony Liguori
parent 7f1796713e
commit 1a728677d4
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
monitor.c
View File

@ -518,10 +518,34 @@ static void do_info_name(Monitor *mon)
monitor_printf(mon, "%s\n", qemu_name); 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 * 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) 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++) { for (cmd = mon_cmds; cmd->name != NULL; cmd++) {
if (monitor_handler_ported(cmd) && !compare_cmd(cmd->name, "info")) { 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)) { if (monitor_handler_ported(cmd)) {
char buf[128]; char buf[128];
snprintf(buf, sizeof(buf), "query-%s", cmd->name); 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));
} }
} }