[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 12/14] ui: Improve "change vnc" error reporting
From: |
Markus Armbruster |
Subject: |
[PATCH v2 12/14] ui: Improve "change vnc" error reporting |
Date: |
Fri, 2 Dec 2022 11:05:10 +0100 |
Switch from monitor_printf() to error_setg() and hmp_handle_error().
This makes "this is an error" more obvious both in the source and in
the monitor, where hmp_handle_error() prefixes the message with
"Error: ".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
monitor/hmp-cmds.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index f0f7b74fb3..8542eee3d4 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -1209,9 +1209,8 @@ void hmp_change(Monitor *mon, const QDict *qdict)
#ifdef CONFIG_VNC
if (strcmp(device, "vnc") == 0) {
if (read_only) {
- monitor_printf(mon,
- "Parameter 'read-only-mode' is invalid for VNC\n");
- return;
+ error_setg(&err, "Parameter 'read-only-mode' is invalid for VNC");
+ goto end;
}
if (strcmp(target, "passwd") == 0 ||
strcmp(target, "password") == 0) {
@@ -1223,7 +1222,8 @@ void hmp_change(Monitor *mon, const QDict *qdict)
qmp_change_vnc_password(arg, &err);
}
} else {
- monitor_printf(mon, "Expected 'password' after 'vnc'\n");
+ error_setg(&err, "Expected 'password' after 'vnc'");
+ goto end;
}
} else
#endif
--
2.37.3
- [PATCH v2 00/14] ui: Move and clean up monitor command code, Markus Armbruster, 2022/12/02
- [PATCH v2 03/14] ui/spice: Require spice-protocol >= 0.14.0, Markus Armbruster, 2022/12/02
- [PATCH v2 01/14] ui: Check numeric part of expire_password argument @time properly, Markus Armbruster, 2022/12/02
- [PATCH v2 04/14] Revert "hmp: info spice: take out webdav", Markus Armbruster, 2022/12/02
- [PATCH v2 02/14] ui: Fix silent truncation of numeric keys in HMP sendkey, Markus Armbruster, 2022/12/02
- [PATCH v2 14/14] ui: Reduce nesting in hmp_change_vnc() slightly, Markus Armbruster, 2022/12/02
- [PATCH v2 12/14] ui: Improve "change vnc" error reporting,
Markus Armbruster <=
- [PATCH v2 10/14] ui: Factor out qmp_add_client() parts and move to ui/ui-qmp-cmds.c, Markus Armbruster, 2022/12/02
- [PATCH v2 07/14] ui/spice: Give hmp_info_spice()'s channel_names[] static linkage, Markus Armbruster, 2022/12/02
- [PATCH v2 08/14] ui: Clean up a few things checkpatch.pl would flag later on, Markus Armbruster, 2022/12/02
- [PATCH v2 13/14] ui: Factor out hmp_change_vnc(), and move to ui/ui-hmp-cmds.c, Markus Armbruster, 2022/12/02
- [PATCH v2 06/14] ui/spice: QXLInterface method set_mm_time() is now dead, drop, Markus Armbruster, 2022/12/02