[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 28/31] vnc: support "-vnc help"
From: |
Paolo Bonzini |
Subject: |
[PULL 28/31] vnc: support "-vnc help" |
Date: |
Sat, 23 Jan 2021 09:31:25 -0500 |
Use qemu_opts_parse_noisily now that HMP does not call
vnc_parse anymore.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20210120144235.345983-4-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/ui/console.h | 2 +-
softmmu/vl.c | 6 +++---
ui/vnc-stubs.c | 7 +++----
ui/vnc.c | 8 ++++----
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index 5dd21976a3..7a3fc11abf 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -439,7 +439,7 @@ void vnc_display_open(const char *id, Error **errp);
void vnc_display_add_client(const char *id, int csock, bool skipauth);
int vnc_display_password(const char *id, const char *password);
int vnc_display_pw_expire(const char *id, time_t expires);
-QemuOpts *vnc_parse(const char *str, Error **errp);
+void vnc_parse(const char *str);
int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp);
/* input.c */
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 59304261cf..a8876b8965 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -1113,7 +1113,7 @@ static void parse_display(const char *p)
* display access.
*/
if (*opts == '=') {
- vnc_parse(opts + 1, &error_fatal);
+ vnc_parse(opts + 1);
} else {
error_report("VNC requires a display argument vnc=<display>");
exit(1);
@@ -1402,7 +1402,7 @@ static void qemu_create_default_devices(void)
if (!qemu_display_find_default(&dpy)) {
dpy.type = DISPLAY_TYPE_NONE;
#if defined(CONFIG_VNC)
- vnc_parse("localhost:0,to=99,id=default", &error_abort);
+ vnc_parse("localhost:0,to=99,id=default");
#endif
}
}
@@ -3186,7 +3186,7 @@ void qemu_init(int argc, char **argv, char **envp)
}
break;
case QEMU_OPTION_vnc:
- vnc_parse(optarg, &error_fatal);
+ vnc_parse(optarg);
break;
case QEMU_OPTION_no_acpi:
olist = qemu_find_opts("machine");
diff --git a/ui/vnc-stubs.c b/ui/vnc-stubs.c
index c6b737dcec..b4eb3ce718 100644
--- a/ui/vnc-stubs.c
+++ b/ui/vnc-stubs.c
@@ -10,13 +10,12 @@ int vnc_display_pw_expire(const char *id, time_t expires)
{
return -ENODEV;
};
-QemuOpts *vnc_parse(const char *str, Error **errp)
+void vnc_parse(const char *str)
{
if (strcmp(str, "none") == 0) {
- return NULL;
+ return;
}
- error_setg(errp, "VNC support is disabled");
- return NULL;
+ error_setg(&error_fatal, "VNC support is disabled");
}
int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp)
{
diff --git a/ui/vnc.c b/ui/vnc.c
index d429bfee5a..66f7c1b936 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -50,6 +50,7 @@
#include "crypto/random.h"
#include "qom/object_interfaces.h"
#include "qemu/cutils.h"
+#include "qemu/help_option.h"
#include "io/dns-resolver.h"
#define VNC_REFRESH_INTERVAL_BASE GUI_REFRESH_INTERVAL_DEFAULT
@@ -4211,14 +4212,14 @@ static void vnc_auto_assign_id(QemuOptsList *olist,
QemuOpts *opts)
qemu_opts_set_id(opts, id);
}
-QemuOpts *vnc_parse(const char *str, Error **errp)
+void vnc_parse(const char *str)
{
QemuOptsList *olist = qemu_find_opts("vnc");
- QemuOpts *opts = qemu_opts_parse(olist, str, true, errp);
+ QemuOpts *opts = qemu_opts_parse_noisily(olist, str, !is_help_option(str));
const char *id;
if (!opts) {
- return NULL;
+ exit(1);
}
id = qemu_opts_id(opts);
@@ -4226,7 +4227,6 @@ QemuOpts *vnc_parse(const char *str, Error **errp)
/* auto-assign id if not present */
vnc_auto_assign_id(olist, opts);
}
- return opts;
}
int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp)
--
2.26.2
- [PULL 25/31] acceptance: switch to QMP change-vnc-password command, (continued)
- [PULL 25/31] acceptance: switch to QMP change-vnc-password command, Paolo Bonzini, 2021/01/23
- [PULL 26/31] hmp: remove "change vnc TARGET" command, Paolo Bonzini, 2021/01/23
- [PULL 11/31] slirp: update to git master, Paolo Bonzini, 2021/01/23
- [PULL 20/31] meson: Display block layer information altogether, Paolo Bonzini, 2021/01/23
- [PULL 21/31] meson: Display crypto-related information altogether, Paolo Bonzini, 2021/01/23
- [PULL 23/31] meson.build: Declare global edk2_targets / install_edk2_blobs variables, Paolo Bonzini, 2021/01/23
- [PULL 27/31] qmp: remove deprecated "change" command, Paolo Bonzini, 2021/01/23
- [PULL 29/31] qemu-option: clean up id vs. list->merge_lists, Paolo Bonzini, 2021/01/23
- [PULL 28/31] vnc: support "-vnc help",
Paolo Bonzini <=
- [PULL 31/31] qemu-option: warn for short-form boolean options, Paolo Bonzini, 2021/01/23
- [PULL 30/31] qemu-option: move help handling to get_opt_name_value, Paolo Bonzini, 2021/01/23
- Re: [PULL 00/31] Misc patches for 2020-01-21, no-reply, 2021/01/23
- Re: [PULL 00/31] Misc patches for 2020-01-21, Peter Maydell, 2021/01/23