[libvirt] [PATCH 3/8] qemu: monitor: Remove support for HMP commands with fds
The remaining HMP commands don't require fd passing so we can purge
filedescriptor passing support from qemuMonitorJSONHumanCommandWitFd and
rename it.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_monitor.c | 2 +-
src/qemu/qemu_monitor_json.c | 11 +++++------
src/qemu/qemu_monitor_json.h | 7 +++----
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index a50aea199d..6a09ba91ed 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -1271,7 +1271,7 @@ qemuMonitorHMPCommand(qemuMonitorPtr mon,
_("Unable to unescape command"));
goto cleanup;
}
- ret = qemuMonitorJSONHumanCommandWithFd(mon, json_cmd, -1, reply);
+ ret = qemuMonitorJSONHumanCommand(mon, json_cmd, reply);
cleanup:
VIR_FREE(json_cmd);
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index ae2b3c1992..22f6fc4947 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -1555,10 +1555,9 @@ static void
qemuMonitorJSONHandleRdmaGidStatusChanged(qemuMonitorPtr mon,
int
-qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon,
- const char *cmd_str,
- int scm_fd,
- char **reply_str)
+qemuMonitorJSONHumanCommand(qemuMonitorPtr mon,
+ const char *cmd_str,
+ char **reply_str)
{
virJSONValuePtr cmd = NULL;
virJSONValuePtr reply = NULL;
@@ -1569,7 +1568,7 @@ qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon,
"s:command-line", cmd_str,
NULL);
- if (!cmd || qemuMonitorJSONCommandWithFd(mon, cmd, scm_fd, &reply) < 0)
+ if (!cmd || qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
goto cleanup;
if (qemuMonitorJSONHasError(reply, "CommandNotFound")) {
@@ -4634,7 +4633,7 @@ int qemuMonitorJSONArbitraryCommand(qemuMonitorPtr mon,
int ret = -1;
if (hmp) {
- return qemuMonitorJSONHumanCommandWithFd(mon, cmd_str, -1, reply_str);
+ return qemuMonitorJSONHumanCommand(mon, cmd_str, reply_str);
} else {
if (!(cmd = virJSONValueFromString(cmd_str)))
goto cleanup;
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index af4e15594e..5330697885 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -41,10 +41,9 @@ int qemuMonitorJSONIOProcess(qemuMonitorPtr mon,
size_t len,
qemuMonitorMessagePtr msg);
-int qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon,
- const char *cmd,
- int scm_fd,
- char **reply);
+int qemuMonitorJSONHumanCommand(qemuMonitorPtr mon,
+ const char *cmd,
+ char **reply);
int qemuMonitorJSONSetCapabilities(qemuMonitorPtr mon);
--
2.21.0