[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/13] ui: Improve a client_migrate_info error message
From: |
Markus Armbruster |
Subject: |
[PULL 06/13] ui: Improve a client_migrate_info error message |
Date: |
Thu, 10 Dec 2020 17:31:25 +0100 |
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 <kraxel@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
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(-)
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;
--
2.26.2
- [PULL 00/13] Miscellaneous patches for 2020-12-10, Markus Armbruster, 2020/12/10
- [PULL 12/13] qapi: Normalize version references x.y.0 to just x.y, Markus Armbruster, 2020/12/10
- [PULL 04/13] block: Improve some block-commit, block-stream error messages, Markus Armbruster, 2020/12/10
- [PULL 02/13] qerror: Drop unused QERR_ macros, Markus Armbruster, 2020/12/10
- [PULL 10/13] qom: Improve {qom, device}-list-properties error messages, Markus Armbruster, 2020/12/10
- [PULL 01/13] Clean up includes, Markus Armbruster, 2020/12/10
- [PULL 06/13] ui: Improve a client_migrate_info error message,
Markus Armbruster <=
- [PULL 11/13] Tweak a few "Parameter 'NAME' expects THING" error message, Markus Armbruster, 2020/12/10
- [PULL 03/13] qerror: Eliminate QERR_ macros used in just one place, Markus Armbruster, 2020/12/10
- [PULL 08/13] qga: Replace an unreachable error by abort(), Markus Armbruster, 2020/12/10
- [PULL 13/13] docs/devel/writing-qmp-commands.txt: Fix docs, Markus Armbruster, 2020/12/10
- [PULL 07/13] ui: Tweak a client_migrate_info error message, Markus Armbruster, 2020/12/10
- [PULL 09/13] qga: Tweak a guest-shutdown error message, Markus Armbruster, 2020/12/10
- [PULL 05/13] ui: Improve some set_passwd, expire_password error messages, Markus Armbruster, 2020/12/10
- Re: [PULL 00/13] Miscellaneous patches for 2020-12-10, Peter Maydell, 2020/12/10