[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/13] ui: Improve some set_passwd, expire_password error messages
From: |
Markus Armbruster |
Subject: |
[PULL 05/13] ui: Improve some set_passwd, expire_password error messages |
Date: |
Thu, 10 Dec 2020 17:31:24 +0100 |
set_passwd and expire_password reject invalid "protocol" with "Invalid
parameter 'protocol'". Misleading; the parameter is valid, its value
isn't. Improve to "Parameter 'protocol' expects 'vnc' or 'spice'".
expire_password fails with "Could not set password". Misleading;
improve to "Could not set password expire time".
QERR_SET_PASSWD_FAILED is now unused. Drop.
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201113082626.2725812-5-armbru@redhat.com>
---
include/qapi/qmp/qerror.h | 3 ---
monitor/qmp-cmds.c | 38 +++++++++++++++-----------------------
2 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
index 5d7e69cc1f..d8267129bc 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_SET_PASSWD_FAILED \
- "Could not set password"
-
#define QERR_UNDEFINED_ERROR \
"An undefined error has occurred"
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index a08143b323..ffbf948d55 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -199,13 +199,7 @@ void qmp_set_password(const char *protocol, const char
*password,
}
rc = qemu_spice.set_passwd(password, fail_if_connected,
disconnect_if_connected);
- if (rc != 0) {
- error_setg(errp, QERR_SET_PASSWD_FAILED);
- }
- return;
- }
-
- if (strcmp(protocol, "vnc") == 0) {
+ } else if (strcmp(protocol, "vnc") == 0) {
if (fail_if_connected || disconnect_if_connected) {
/* vnc supports "connected=keep" only */
error_setg(errp, QERR_INVALID_PARAMETER, "connected");
@@ -214,13 +208,15 @@ void qmp_set_password(const char *protocol, const char
*password,
/* Note that setting an empty password will not disable login through
* this interface. */
rc = vnc_display_password(NULL, password);
- if (rc < 0) {
- error_setg(errp, QERR_SET_PASSWD_FAILED);
- }
+ } else {
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol",
+ "'vnc' or 'spice'");
return;
}
- error_setg(errp, QERR_INVALID_PARAMETER, "protocol");
+ if (rc != 0) {
+ error_setg(errp, "Could not set password");
+ }
}
void qmp_expire_password(const char *protocol, const char *whenstr,
@@ -244,28 +240,24 @@ void qmp_expire_password(const char *protocol, const char
*whenstr,
return;
}
rc = qemu_spice.set_pw_expire(when);
- if (rc != 0) {
- error_setg(errp, QERR_SET_PASSWD_FAILED);
- }
- return;
- }
-
- if (strcmp(protocol, "vnc") == 0) {
+ } else if (strcmp(protocol, "vnc") == 0) {
rc = vnc_display_pw_expire(NULL, when);
- if (rc != 0) {
- error_setg(errp, QERR_SET_PASSWD_FAILED);
- }
+ } else {
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol",
+ "'vnc' or 'spice'");
return;
}
- error_setg(errp, QERR_INVALID_PARAMETER, "protocol");
+ if (rc != 0) {
+ error_setg(errp, "Could not set password expire time");
+ }
}
#ifdef CONFIG_VNC
void qmp_change_vnc_password(const char *password, Error **errp)
{
if (vnc_display_password(NULL, password) < 0) {
- error_setg(errp, QERR_SET_PASSWD_FAILED);
+ error_setg(errp, "Could not set password");
}
}
--
2.26.2
- [PULL 10/13] qom: Improve {qom, device}-list-properties error messages, (continued)
- [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, 2020/12/10
- [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 <=
- Re: [PULL 00/13] Miscellaneous patches for 2020-12-10, Peter Maydell, 2020/12/10