From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 12/17] ui: Improve "change vnc" error reporting
Date: Thu, 19 Jan 2023 14:27:08 +0100 [thread overview]
Message-ID: <20230119132713.3493556-13-armbru@redhat.com> (raw)
In-Reply-To: <20230119132713.3493556-1-armbru@redhat.com>
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>
Message-Id: <20230109190321.1056914-13-armbru@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.39.0
next prev parent reply other threads:[~2023-01-19 13:33 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 13:26 [PULL 00/17] Monitor patches for 2023-01-19 Markus Armbruster
2023-01-19 13:26 ` [PULL 01/17] ui: Check numeric part of expire_password argument @time properly Markus Armbruster
2023-01-19 13:26 ` [PULL 02/17] ui: Fix silent truncation of numeric keys in HMP sendkey Markus Armbruster
2023-01-19 13:26 ` [PULL 03/17] ui/spice: Require spice-protocol >= 0.14.0 Markus Armbruster
2023-01-19 13:27 ` [PULL 04/17] Revert "hmp: info spice: take out webdav" Markus Armbruster
2023-01-19 13:27 ` [PULL 05/17] ui/spice: Require spice-server >= 0.14.0 Markus Armbruster
2023-01-19 13:27 ` [PULL 06/17] ui/spice: QXLInterface method set_mm_time() is now dead, drop Markus Armbruster
2023-01-19 13:27 ` [PULL 07/17] ui/spice: Give hmp_info_spice()'s channel_names[] static linkage Markus Armbruster
2023-01-19 13:27 ` [PULL 08/17] ui: Clean up a few things checkpatch.pl would flag later on Markus Armbruster
2023-01-19 13:27 ` [PULL 09/17] ui: Move QMP commands from monitor to new ui/ui-qmp-cmds.c Markus Armbruster
2023-01-19 13:27 ` [PULL 10/17] ui: Factor out qmp_add_client() parts and move to ui/ui-qmp-cmds.c Markus Armbruster
2023-01-19 13:27 ` [PULL 11/17] ui: Move HMP commands from monitor to new ui/ui-hmp-cmds.c Markus Armbruster
2023-01-19 13:27 ` Markus Armbruster [this message]
2023-01-19 13:27 ` [PULL 13/17] ui: Factor out hmp_change_vnc(), and move to ui/ui-hmp-cmds.c Markus Armbruster
2023-01-19 13:27 ` [PULL 14/17] ui: Reduce nesting in hmp_change_vnc() slightly Markus Armbruster
2023-01-19 13:27 ` [PULL 15/17] ui: Don't check for mode change after mouse_set error Markus Armbruster
2023-01-19 13:27 ` [PULL 16/17] ui: Split hmp_mouse_set() and move the HMP part to ui/ Markus Armbruster
2023-01-19 13:27 ` [PULL 17/17] ui: Simplify control flow in qemu_mouse_set() Markus Armbruster
2023-01-20 13:17 ` [PULL 00/17] Monitor patches for 2023-01-19 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230119132713.3493556-13-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).