NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: monitor: Don't handle HMP in qemuMonitorJSONArbitraryCommand

Browse Source 
Call to qemuMonitorJSONHumanCommand directly from
qemuMonitorArbitraryCommand.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Peter Krempa 2019-09-19 17:53:45 +02:00
parent 1155a5721b
commit 19f8309a3b
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_monitor.c
View File

@ -3191,7 +3191,10 @@ qemuMonitorArbitraryCommand(qemuMonitorPtr mon,
QEMU_CHECK_MONITOR(mon); QEMU_CHECK_MONITOR(mon);
return qemuMonitorJSONArbitraryCommand(mon, cmd, reply, hmp); if (hmp)
return qemuMonitorJSONHumanCommand(mon, cmd, reply);
else
return qemuMonitorJSONArbitraryCommand(mon, cmd, reply);
} }

19
src/qemu/qemu_monitor_json.c
View File

@ -4624,25 +4624,20 @@ qemuMonitorJSONDiskNameLookup(qemuMonitorPtr mon,
int qemuMonitorJSONArbitraryCommand(qemuMonitorPtr mon, int qemuMonitorJSONArbitraryCommand(qemuMonitorPtr mon,
const char *cmd_str, const char *cmd_str,
char **reply_str, char **reply_str)
bool hmp)
{ {
virJSONValuePtr cmd = NULL; virJSONValuePtr cmd = NULL;
virJSONValuePtr reply = NULL; virJSONValuePtr reply = NULL;
int ret = -1; int ret = -1;
if (hmp) { if (!(cmd = virJSONValueFromString(cmd_str)))
return qemuMonitorJSONHumanCommand(mon, cmd_str, reply_str); goto cleanup;
} else {
if (!(cmd = virJSONValueFromString(cmd_str)))
goto cleanup;
if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
goto cleanup; goto cleanup;
if (!(*reply_str = virJSONValueToString(reply, false))) if (!(*reply_str = virJSONValueToString(reply, false)))
goto cleanup; goto cleanup;
}
ret = 0; ret = 0;

3
src/qemu/qemu_monitor_json.h
View File

@ -286,8 +286,7 @@ char *qemuMonitorJSONDiskNameLookup(qemuMonitorPtr mon,
int qemuMonitorJSONArbitraryCommand(qemuMonitorPtr mon, int qemuMonitorJSONArbitraryCommand(qemuMonitorPtr mon,
const char *cmd_str, const char *cmd_str,
char **reply_str, char **reply_str);
bool hmp);
int qemuMonitorJSONInjectNMI(qemuMonitorPtr mon); int qemuMonitorJSONInjectNMI(qemuMonitorPtr mon);