[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 12/17] ui: Improve "change vnc" error reporting
From: |
Markus Armbruster |
Subject: |
[PATCH v4 12/17] ui: Improve "change vnc" error reporting |
Date: |
Mon, 9 Jan 2023 20:03:16 +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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
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.39.0
- [PATCH v4 17/17] ui: Simplify control flow in qemu_mouse_set(), (continued)
- [PATCH v4 17/17] ui: Simplify control flow in qemu_mouse_set(), Markus Armbruster, 2023/01/09
- [PATCH v4 09/17] ui: Move QMP commands from monitor to new ui/ui-qmp-cmds.c, Markus Armbruster, 2023/01/09
- [PATCH v4 07/17] ui/spice: Give hmp_info_spice()'s channel_names[] static linkage, Markus Armbruster, 2023/01/09
- [PATCH v4 10/17] ui: Factor out qmp_add_client() parts and move to ui/ui-qmp-cmds.c, Markus Armbruster, 2023/01/09
- [PATCH v4 15/17] ui: Don't check for mode change after mouse_set error, Markus Armbruster, 2023/01/09
- [PATCH v4 01/17] ui: Check numeric part of expire_password argument @time properly, Markus Armbruster, 2023/01/09
- [PATCH v4 12/17] ui: Improve "change vnc" error reporting,
Markus Armbruster <=
- [PATCH v4 13/17] ui: Factor out hmp_change_vnc(), and move to ui/ui-hmp-cmds.c, Markus Armbruster, 2023/01/09
- [PATCH v4 03/17] ui/spice: Require spice-protocol >= 0.14.0, Markus Armbruster, 2023/01/09