diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-12-10 17:01:05 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-12-10 17:01:05 +0000 |
| commit | 2ecfc0657afa5d29a373271b342f704a1a3c6737 (patch) | |
| tree | 7089fede165ebba103fe39b204388f30116dd9dc /monitor/misc.c | |
| parent | 379e9eaed497a2e09b5985e1e15967d7bfea8296 (diff) | |
| parent | 4eb79bdf87206a223a7ad7a698af519d2ec75c14 (diff) | |
| download | focaccia-qemu-2ecfc0657afa5d29a373271b342f704a1a3c6737.tar.gz focaccia-qemu-2ecfc0657afa5d29a373271b342f704a1a3c6737.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2020-12-10' into staging
Miscellaneous patches for 2020-12-10
# gpg: Signature made Thu 10 Dec 2020 16:17:43 GMT
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-misc-2020-12-10:
docs/devel/writing-qmp-commands.txt: Fix docs
qapi: Normalize version references x.y.0 to just x.y
Tweak a few "Parameter 'NAME' expects THING" error message
qom: Improve {qom,device}-list-properties error messages
qga: Tweak a guest-shutdown error message
qga: Replace an unreachable error by abort()
ui: Tweak a client_migrate_info error message
ui: Improve a client_migrate_info error message
ui: Improve some set_passwd, expire_password error messages
block: Improve some block-commit, block-stream error messages
qerror: Eliminate QERR_ macros used in just one place
qerror: Drop unused QERR_ macros
Clean up includes
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'monitor/misc.c')
| -rw-r--r-- | monitor/misc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/monitor/misc.c b/monitor/misc.c index 398211a034..7ffe6f7a84 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -441,13 +441,13 @@ void qmp_client_migrate_info(const char *protocol, const char *hostname, has_port ? port : -1, has_tls_port ? tls_port : -1, cert_subject)) { - error_setg(errp, QERR_UNDEFINED_ERROR); + error_setg(errp, "Could not set up display for migration"); return; } return; } - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", "spice"); + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", "'spice'"); } static void hmp_logfile(Monitor *mon, const QDict *qdict) @@ -1232,7 +1232,7 @@ void qmp_getfd(const char *fdname, Error **errp) fd = qemu_chr_fe_get_msgfd(&cur_mon->chr); if (fd == -1) { - error_setg(errp, QERR_FD_NOT_SUPPLIED); + error_setg(errp, "No file descriptor supplied via SCM_RIGHTS"); return; } @@ -1286,7 +1286,7 @@ void qmp_closefd(const char *fdname, Error **errp) } qemu_mutex_unlock(&cur_mon->mon_lock); - error_setg(errp, QERR_FD_NOT_FOUND, fdname); + error_setg(errp, "File descriptor named '%s' not found", fdname); } int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp) @@ -1357,7 +1357,7 @@ AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdset_id, bool has_opaque, fd = qemu_chr_fe_get_msgfd(&mon->chr); if (fd == -1) { - error_setg(errp, QERR_FD_NOT_SUPPLIED); + error_setg(errp, "No file descriptor supplied via SCM_RIGHTS"); goto error; } @@ -1410,7 +1410,7 @@ error: } else { snprintf(fd_str, sizeof(fd_str), "fdset-id:%" PRId64, fdset_id); } - error_setg(errp, QERR_FD_NOT_FOUND, fd_str); + error_setg(errp, "File descriptor named '%s' not found", fd_str); } FdsetInfoList *qmp_query_fdsets(Error **errp) |