The handlers for 'add-fd' and 'remove-fd' are unused now and riddled with legacy cruft. Purge them. Last use was removed in f2019083de3430101b94d4991a38fd947a08fd32. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_monitor.c | 53 ------------------------- src/qemu/qemu_monitor.h | 4 +- src/qemu/qemu_monitor_json.c | 75 ------------------------------------ src/qemu/qemu_monitor_json.h | 3 -- 4 files changed, 1 insertion(+), 134 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index aa230b3306..865bdbfed1 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2789,59 +2789,6 @@ qemuMonitorCloseFileHandle(qemuMonitorPtr mon, } -/* Add the open file descriptor FD into the non-negative set FDSET. - * If NAME is present, it will be passed along for logging purposes. - * Returns the counterpart fd that qemu received, or -1 on error. */ -int -qemuMonitorAddFd(qemuMonitorPtr mon, int fdset, int fd, const char *name) -{ - VIR_DEBUG("fdset=%d, fd=%d, name=%s", fdset, fd, NULLSTR(name)); - - QEMU_CHECK_MONITOR(mon); - - if (fd < 0 || fdset < 0) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("fd and fdset must be valid")); - return -1; - } - - if (!mon->hasSendFD) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("qemu is not using a unix socket monitor, " - "cannot send fd %s"), NULLSTR(name)); - return -1; - } - - return qemuMonitorJSONAddFd(mon, fdset, fd, name); -} - - -/* Remove one of qemu's fds from the given FDSET, or if FD is - * negative, remove the entire set. Preserve any previous error on - * entry. Returns 0 on success, -1 on error. */ -int -qemuMonitorRemoveFd(qemuMonitorPtr mon, int fdset, int fd) -{ - int ret = -1; - virErrorPtr error; - - VIR_DEBUG("fdset=%d, fd=%d", fdset, fd); - - error = virSaveLastError(); - - QEMU_CHECK_MONITOR_GOTO(mon, cleanup); - - ret = qemuMonitorJSONRemoveFd(mon, fdset, fd); - - cleanup: - if (error) { - virSetError(error); - virFreeError(error); - } - return ret; -} - - int qemuMonitorAddNetdev(qemuMonitorPtr mon, const char *netdevstr, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 70000a1c72..7fdda01bdd 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -874,14 +874,12 @@ int qemuMonitorGraphicsRelocate(qemuMonitorPtr mon, int qemuMonitorSendFileHandle(qemuMonitorPtr mon, const char *fdname, int fd); -int qemuMonitorAddFd(qemuMonitorPtr mon, int fdset, int fd, const char *name); -/* These two functions preserve previous error and only set their own +/* This function preserves previous error and only set their own * error if no error was set before. */ int qemuMonitorCloseFileHandle(qemuMonitorPtr mon, const char *fdname); -int qemuMonitorRemoveFd(qemuMonitorPtr mon, int fdset, int fd); int qemuMonitorAddNetdev(qemuMonitorPtr mon, const char *netdevstr, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e4404f0199..ae2b3c1992 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3850,81 +3850,6 @@ int qemuMonitorJSONCloseFileHandle(qemuMonitorPtr mon, } -int -qemuMonitorJSONAddFd(qemuMonitorPtr mon, int fdset, int fd, const char *name) -{ - int ret; - virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("add-fd", - "i:fdset-id", fdset, - "S:opaque", name, - NULL); - virJSONValuePtr reply = NULL; - if (!cmd) - return -1; - - ret = qemuMonitorJSONCommandWithFd(mon, cmd, fd, &reply); - - if (ret == 0) { - /* qemu 1.2 lacks the functionality we need; but we have to - * probe to find that out. Don't log errors in that case. */ - if (STREQ_NULLABLE(name, "/dev/null") && - qemuMonitorJSONHasError(reply, "GenericError")) { - ret = -2; - goto cleanup; - } - ret = qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT); - } - if (ret == 0) { - virJSONValuePtr data = virJSONValueObjectGetObject(reply, "return"); - - if (virJSONValueObjectGetNumberInt(data, "fd", &ret) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("incomplete return information")); - goto error; - } - } - - cleanup: - virJSONValueFree(cmd); - virJSONValueFree(reply); - return ret; - - error: - /* Best effort cleanup - kill the entire fdset (even if it has - * earlier successful fd registrations), since we don't know which - * fd qemu got, and don't want to leave the fd leaked in qemu. */ - qemuMonitorJSONRemoveFd(mon, fdset, -1); - ret = -1; - goto cleanup; -} - - -int -qemuMonitorJSONRemoveFd(qemuMonitorPtr mon, int fdset, int fd) -{ - int ret = -1; - virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("remove-fd", - "i:fdset-id", fdset, - fd < 0 ? NULL : "i:fd", - fd, NULL); - virJSONValuePtr reply = NULL; - if (!cmd) - return -1; - - if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) - goto cleanup; - - if (qemuMonitorJSONCheckError(cmd, reply) < 0) - goto cleanup; - - ret = 0; - cleanup: - virJSONValueFree(cmd); - virJSONValueFree(reply); - return ret; -} - - int qemuMonitorJSONAddNetdev(qemuMonitorPtr mon, const char *netdevstr) { diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 61e64e831b..af4e15594e 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -203,12 +203,9 @@ int qemuMonitorJSONRemovePCIDevice(qemuMonitorPtr mon, int qemuMonitorJSONSendFileHandle(qemuMonitorPtr mon, const char *fdname, int fd); -int qemuMonitorJSONAddFd(qemuMonitorPtr mon, int fdset, int fd, - const char *name); int qemuMonitorJSONCloseFileHandle(qemuMonitorPtr mon, const char *fdname); -int qemuMonitorJSONRemoveFd(qemuMonitorPtr mon, int fdset, int fd); int qemuMonitorJSONAddNetdev(qemuMonitorPtr mon, const char *netdevstr); -- 2.21.0

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&gt; --- 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

We don't need to escape the commands any more since we use QMP passthrough, which means we can delete the functions. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_monitor.c | 93 ------------------------------------ src/qemu/qemu_monitor.h | 3 -- tests/qemumonitortestutils.c | 6 +-- 3 files changed, 1 insertion(+), 101 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index c15b194bb5..f52a381982 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -197,99 +197,6 @@ VIR_ENUM_IMPL(qemuMonitorDumpStatus, "none", "active", "completed", "failed", ); -char * -qemuMonitorEscapeArg(const char *in) -{ - int len = 0; - size_t i, j; - char *out; - - /* To pass through the QEMU monitor, we need to use escape - sequences: \r, \n, \", \\ - */ - - for (i = 0; in[i] != '\0'; i++) { - switch (in[i]) { - case '\r': - case '\n': - case '"': - case '\\': - len += 2; - break; - default: - len += 1; - break; - } - } - - if (VIR_ALLOC_N(out, len + 1) < 0) - return NULL; - - for (i = j = 0; in[i] != '\0'; i++) { - switch (in[i]) { - case '\r': - out[j++] = '\\'; - out[j++] = 'r'; - break; - case '\n': - out[j++] = '\\'; - out[j++] = 'n'; - break; - case '"': - case '\\': - out[j++] = '\\'; - out[j++] = in[i]; - break; - default: - out[j++] = in[i]; - break; - } - } - out[j] = '\0'; - - return out; -} - - -char * -qemuMonitorUnescapeArg(const char *in) -{ - size_t i, j; - char *out; - int len = strlen(in); - char next; - - if (VIR_ALLOC_N(out, len + 1) < 0) - return NULL; - - for (i = j = 0; i < len; ++i) { - next = in[i]; - if (in[i] == '\\') { - ++i; - switch (in[i]) { - case 'r': - next = '\r'; - break; - case 'n': - next = '\n'; - break; - case '"': - case '\\': - next = in[i]; - break; - default: - /* invalid input (including trailing '\' at end of in) */ - VIR_FREE(out); - return NULL; - } - } - out[j++] = next; - } - out[j] = '\0'; - - return out; -} - #if DEBUG_RAW_IO # include <c-ctype.h> diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 7385fafeea..af1ec56525 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -382,9 +382,6 @@ struct _qemuMonitorCallbacks { qemuMonitorDomainRdmaGidStatusChangedCallback domainRdmaGidStatusChanged; }; -char *qemuMonitorEscapeArg(const char *in); -char *qemuMonitorUnescapeArg(const char *in); - qemuMonitorPtr qemuMonitorOpen(virDomainObjPtr vm, virDomainChrSourceDefPtr config, bool retry, diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 4cc07b8772..e9dff123f8 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -187,7 +187,6 @@ int ATTRIBUTE_FMT_PRINTF(2, 3) qemuMonitorReportError(qemuMonitorTestPtr test, const char *errmsg, ...) { va_list msgargs; - VIR_AUTOFREE(char *) tmp = NULL; VIR_AUTOFREE(char *) msg = NULL; VIR_AUTOFREE(char *) jsonmsg = NULL; int ret = -1; @@ -197,13 +196,10 @@ qemuMonitorReportError(qemuMonitorTestPtr test, const char *errmsg, ...) if (virVasprintf(&msg, errmsg, msgargs) < 0) goto cleanup; - if (!(tmp = qemuMonitorEscapeArg(msg))) - goto cleanup; - if (virAsprintf(&jsonmsg, "{ \"error\": " " { \"desc\": \"%s\", " " \"class\": \"UnexpectedCommand\" } }", - tmp) < 0) + msg) < 0) goto cleanup; ret = qemuMonitorTestAddResponse(test, jsonmsg); -- 2.21.0

Call to qemuMonitorJSONHumanCommand directly from qemuMonitorArbitraryCommand. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_monitor.c | 5 ++++- src/qemu/qemu_monitor_json.c | 19 +++++++------------ src/qemu/qemu_monitor_json.h | 3 +-- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index f52a381982..af4c41fa16 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3191,7 +3191,10 @@ qemuMonitorArbitraryCommand(qemuMonitorPtr mon, QEMU_CHECK_MONITOR(mon); - return qemuMonitorJSONArbitraryCommand(mon, cmd, reply, hmp); + if (hmp) + return qemuMonitorJSONHumanCommand(mon, cmd, reply); + else + return qemuMonitorJSONArbitraryCommand(mon, cmd, reply); } diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 891d2c3089..b8ec9ac59a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4624,25 +4624,20 @@ qemuMonitorJSONDiskNameLookup(qemuMonitorPtr mon, int qemuMonitorJSONArbitraryCommand(qemuMonitorPtr mon, const char *cmd_str, - char **reply_str, - bool hmp) + char **reply_str) { virJSONValuePtr cmd = NULL; virJSONValuePtr reply = NULL; int ret = -1; - if (hmp) { - return qemuMonitorJSONHumanCommand(mon, cmd_str, reply_str); - } else { - if (!(cmd = virJSONValueFromString(cmd_str))) - goto cleanup; + if (!(cmd = virJSONValueFromString(cmd_str))) + goto cleanup; - if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) - goto cleanup; + if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) + goto cleanup; - if (!(*reply_str = virJSONValueToString(reply, false))) - goto cleanup; - } + if (!(*reply_str = virJSONValueToString(reply, false))) + goto cleanup; ret = 0; diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 5330697885..a608410703 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -286,8 +286,7 @@ char *qemuMonitorJSONDiskNameLookup(qemuMonitorPtr mon, int qemuMonitorJSONArbitraryCommand(qemuMonitorPtr mon, const char *cmd_str, - char **reply_str, - bool hmp); + char **reply_str); int qemuMonitorJSONInjectNMI(qemuMonitorPtr mon); -- 2.21.0