diff options
| author | Markus Armbruster <armbru@redhat.com> | 2023-01-09 20:03:16 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2023-01-19 13:30:01 +0100 |
| commit | f8f2e9a859a1450756972266b0d6f4c081e6486c (patch) | |
| tree | 687911128c597f47b141ccbeefec806836bce3a0 | |
| parent | 5011d262f0580ae7d9acf35256697520db2f1720 (diff) | |
| download | focaccia-qemu-f8f2e9a859a1450756972266b0d6f4c081e6486c.tar.gz focaccia-qemu-f8f2e9a859a1450756972266b0d6f4c081e6486c.zip | |
ui: Improve "change vnc" error reporting
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>
| -rw-r--r-- | monitor/hmp-cmds.c | 8 |
1 files 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 |