diff mbox series

[4/7] ui/qmp-cmds: Improve two error messages

Message ID 20231031111059.3407803-5-armbru@redhat.com
State New
Headers show
Series Miscellaneous error message improvements | expand

Commit Message

Markus Armbruster Oct. 31, 2023, 11:10 a.m. UTC 
set_password with "protocol": "vnc" supports only "connected": "keep".
Any other value is rejected with

    Invalid parameter 'connected'

Improve this to

    parameter 'connected' must be 'keep' when 'protocol' is 'vnc'

client_migrate_info requires "port" or "tls-port".  When both are
missing, it fails with

    Parameter 'port/tls-port' is missing

Improve this to

    parameter 'port' or 'tls-port' is required

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 ui/ui-qmp-cmds.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Philippe Mathieu-Daudé Oct. 31, 2023, 2:46 p.m. UTC | #1 
On 31/10/23 12:10, Markus Armbruster wrote:
> set_password with "protocol": "vnc" supports only "connected": "keep".
> Any other value is rejected with
> 
>      Invalid parameter 'connected'
> 
> Improve this to
> 
>      parameter 'connected' must be 'keep' when 'protocol' is 'vnc'
> 
> client_migrate_info requires "port" or "tls-port".  When both are
> missing, it fails with
> 
>      Parameter 'port/tls-port' is missing
> 
> Improve this to
> 
>      parameter 'port' or 'tls-port' is required
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   ui/ui-qmp-cmds.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff mbox series

Patch

diff --git a/ui/ui-qmp-cmds.c b/ui/ui-qmp-cmds.c
index debc07d678..8880691f92 100644
--- a/ui/ui-qmp-cmds.c
+++ b/ui/ui-qmp-cmds.c
@@ -44,7 +44,8 @@  void qmp_set_password(SetPasswordOptions *opts, Error **errp)
         assert(opts->protocol == DISPLAY_PROTOCOL_VNC);
         if (opts->connected != SET_PASSWORD_ACTION_KEEP) {
             /* vnc supports "connected=keep" only */
-            error_setg(errp, QERR_INVALID_PARAMETER, "connected");
+            error_setg(errp, "parameter 'connected' must be 'keep'"
+                       " when 'protocol' is 'vnc'");
             return;
         }
         /*
@@ -195,7 +196,7 @@  void qmp_client_migrate_info(const char *protocol, const char *hostname,
         }
 
         if (!has_port && !has_tls_port) {
-            error_setg(errp, QERR_MISSING_PARAMETER, "port/tls-port");
+            error_setg(errp, "parameter 'port' or 'tls-port' is required");
             return;
         }