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

qapi: Convert human-monitor-command

Browse Source 
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Luiz Capitulino 2011-11-25 17:52:45 -02:00
parent 6106e2492f
commit d51a67b4d3
3 changed files with 43 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
monitor.c
View File

@ -513,10 +513,10 @@ static int do_qmp_capabilities(Monitor *mon, const QDict *params,
static void handle_user_command(Monitor *mon, const char *cmdline); static void handle_user_command(Monitor *mon, const char *cmdline);
static int do_hmp_passthrough(Monitor *mon, const QDict *params, char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
QObject **ret_data) int64_t cpu_index, Error **errp)
{ {
int ret = 0; char *output = NULL;
Monitor *old_mon, hmp; Monitor *old_mon, hmp;
CharDriverState mchar; CharDriverState mchar;
@ -527,25 +527,30 @@ static int do_hmp_passthrough(Monitor *mon, const QDict *params,
old_mon = cur_mon; old_mon = cur_mon;
cur_mon = &hmp; cur_mon = &hmp;
if (qdict_haskey(params, "cpu-index")) { if (has_cpu_index) {
ret = monitor_set_cpu(qdict_get_int(params, "cpu-index")); int ret = monitor_set_cpu(cpu_index);
if (ret < 0) { if (ret < 0) {
cur_mon = old_mon; cur_mon = old_mon;
qerror_report(QERR_INVALID_PARAMETER_VALUE, "cpu-index", "a CPU number"); error_set(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index",
"a CPU number");
goto out; goto out;
} }
} }
handle_user_command(&hmp, qdict_get_str(params, "command-line")); handle_user_command(&hmp, command_line);
cur_mon = old_mon; cur_mon = old_mon;
if (qemu_chr_mem_osize(hmp.chr) > 0) { if (qemu_chr_mem_osize(hmp.chr) > 0) {
*ret_data = QOBJECT(qemu_chr_mem_to_qs(hmp.chr)); QString *str = qemu_chr_mem_to_qs(hmp.chr);
output = g_strdup(qstring_get_str(str));
QDECREF(str);
} else {
output = g_strdup("");
} }
out: out:
qemu_chr_close_mem(hmp.chr); qemu_chr_close_mem(hmp.chr);
return ret; return output;
} }
static int compare_cmd(const char *name, const char *list) static int compare_cmd(const char *name, const char *list)

28
qapi-schema.json
View File

@ -1099,3 +1099,31 @@
## ##
{ 'command': 'blockdev-snapshot-sync', { 'command': 'blockdev-snapshot-sync',
'data': { 'device': 'str', 'snapshot-file': 'str', '*format': 'str' } } 'data': { 'device': 'str', 'snapshot-file': 'str', '*format': 'str' } }
##
# @human-monitor-command:
#
# Execute a command on the human monitor and return the output.
#
# @command-line: the command to execute in the human monitor
#
# @cpu-index: #optional The CPU to use for commands that require an implicit CPU
#
# Returns: the output of the command as a string
#
# Since: 0.14.0
#
# Notes: This command only exists as a stop-gap. It's use is highly
# discouraged. The semantics of this command are not guaranteed.
#
# Known limitations:
#
# o This command is stateless, this means that commands that depend
# on state information (such as getfd) might not work
#
# o Commands that prompt the user for data (eg. 'cont' when the block
# device is encrypted) don't currently work
##
{ 'command': 'human-monitor-command',
'data': {'command-line': 'str', '*cpu-index': 'int'},
'returns': 'str' }

5
qmp-commands.hx
View File

@ -970,10 +970,7 @@ EQMP
{ {
.name = "human-monitor-command", .name = "human-monitor-command",
.args_type = "command-line:s,cpu-index:i?", .args_type = "command-line:s,cpu-index:i?",
.params = "", .mhandler.cmd_new = qmp_marshal_input_human_monitor_command,
.help = "",
.user_print = monitor_user_noop,
.mhandler.cmd_new = do_hmp_passthrough,
}, },
SQMP SQMP