[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 13/18] ui: Improve "change vnc" error reporting
From: |
Markus Armbruster |
Subject: |
[PATCH v3 13/18] ui: Improve "change vnc" error reporting |
Date: |
Tue, 20 Dec 2022 10:06:40 +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 c4f161a596..4340e71c90 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -1097,9 +1097,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) {
@@ -1111,7 +1110,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.38.1
- [PATCH v3 00/18] ui: Move and clean up monitor command code, Markus Armbruster, 2022/12/20
- [PATCH v3 02/18] ui: Fix silent truncation of numeric keys in HMP sendkey, Markus Armbruster, 2022/12/20
- [PATCH v3 04/18] Revert "hmp: info spice: take out webdav", Markus Armbruster, 2022/12/20
- [PATCH v3 10/18] ui: Factor out qmp_add_client() parts and move to ui/ui-qmp-cmds.c, Markus Armbruster, 2022/12/20
- [PATCH v3 09/18] ui: Move QMP commands from monitor to new ui/ui-qmp-cmds.c, Markus Armbruster, 2022/12/20
- [PATCH v3 01/18] ui: Check numeric part of expire_password argument @time properly, Markus Armbruster, 2022/12/20
- [PATCH v3 13/18] ui: Improve "change vnc" error reporting,
Markus Armbruster <=
- [PATCH v3 18/18] ui: Simplify control flow in qemu_mouse_set(), Markus Armbruster, 2022/12/20
- [PATCH v3 07/18] ui/spice: Give hmp_info_spice()'s channel_names[] static linkage, Markus Armbruster, 2022/12/20
- [PATCH v3 06/18] ui/spice: QXLInterface method set_mm_time() is now dead, drop, Markus Armbruster, 2022/12/20
- [PATCH v3 03/18] ui/spice: Require spice-protocol >= 0.14.0, Markus Armbruster, 2022/12/20
- [PATCH v3 14/18] ui: Factor out hmp_change_vnc(), and move to ui/ui-hmp-cmds.c, Markus Armbruster, 2022/12/20
- [PATCH v3 15/18] ui: Reduce nesting in hmp_change_vnc() slightly, Markus Armbruster, 2022/12/20
- [PATCH v3 12/18] ui: Move more HMP commands from monitor to ui/, Markus Armbruster, 2022/12/20