diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-01-20 15:42:35 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-01-23 15:55:07 -0500 |
| commit | 653c97473530b4d0e79950103447bad99b64ed79 (patch) | |
| tree | bcef6bd95df70dee0db6d75c4481602ac2ed621f /ui/vnc.c | |
| parent | 0afec75734331a0b52fa3aa4235220eda8c7846f (diff) | |
| download | focaccia-qemu-653c97473530b4d0e79950103447bad99b64ed79.tar.gz focaccia-qemu-653c97473530b4d0e79950103447bad99b64ed79.zip | |
vnc: support "-vnc help"
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>
Diffstat (limited to 'ui/vnc.c')
| -rw-r--r-- | ui/vnc.c | 8 |
1 files changed, 4 insertions, 4 deletions
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) |