From f820af87433af84c13cd260807b59bbce47e2f0a Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 13 Nov 2020 09:26:18 +0100 Subject: qerror: Eliminate QERR_ macros used in just one place Signed-off-by: Markus Armbruster Message-Id: <20201113082626.2725812-3-armbru@redhat.com> --- monitor/misc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'monitor/misc.c') diff --git a/monitor/misc.c b/monitor/misc.c index 398211a034..c563e901c0 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -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) -- cgit 1.4.1 From 9e1b9c6c2d909d399ced0379e7095716c611b0f9 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 13 Nov 2020 09:26:21 +0100 Subject: ui: Improve a client_migrate_info error message client_migrate_info reports spice_server_migrate_connect() failure as "An undefined error has occurred". Improve to "Could not set up display for migration". QERR_UNDEFINED_ERROR is now unused. Drop. Cc: Gerd Hoffmann Signed-off-by: Markus Armbruster Message-Id: <20201113082626.2725812-6-armbru@redhat.com> --- include/qapi/qmp/qerror.h | 3 --- monitor/misc.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'monitor/misc.c') diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index d8267129bc..596fce0c54 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -65,9 +65,6 @@ #define QERR_REPLAY_NOT_SUPPORTED \ "Record/replay feature is not supported for '%s'" -#define QERR_UNDEFINED_ERROR \ - "An undefined error has occurred" - #define QERR_UNSUPPORTED \ "this feature or command is not currently supported" diff --git a/monitor/misc.c b/monitor/misc.c index c563e901c0..bb102df823 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -441,7 +441,7 @@ 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; -- cgit 1.4.1 From 99750d82e43e3825ded46b41828552d357f346bc Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 13 Nov 2020 09:26:22 +0100 Subject: ui: Tweak a client_migrate_info error message Change Parameter 'protocol' expects spice to Parameter 'protocol' expects 'spice' for consistency with similar error messages elsewhere. Cc: Gerd Hoffmann Signed-off-by: Markus Armbruster Message-Id: <20201113082626.2725812-7-armbru@redhat.com> --- monitor/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'monitor/misc.c') diff --git a/monitor/misc.c b/monitor/misc.c index bb102df823..7ffe6f7a84 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -447,7 +447,7 @@ void qmp_client_migrate_info(const char *protocol, const char *hostname, 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) -- cgit 1.4.1