* [PATCH v2 0/2] qemu-options: define -spice only #ifdef CONFIG_SPICE
@ 2021-11-15 8:03 marcandre.lureau
2021-11-15 8:03 ` [PATCH v2 1/2] " marcandre.lureau
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: marcandre.lureau @ 2021-11-15 8:03 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, berrange, armbru, Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Hi,
This is v2 of "[PATCH] qemu-options.hx: remove -spice options from --help",
after Markus comment on patch title.
Marc-André Lureau (2):
qemu-options: define -spice only #ifdef CONFIG_SPICE
vl: typo fix in a comment
softmmu/vl.c | 4 +++-
qemu-options.hx | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
--
2.33.0.721.g106298f7f9
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 1/2] qemu-options: define -spice only #ifdef CONFIG_SPICE 2021-11-15 8:03 [PATCH v2 0/2] qemu-options: define -spice only #ifdef CONFIG_SPICE marcandre.lureau @ 2021-11-15 8:03 ` marcandre.lureau 2021-11-18 11:58 ` Markus Armbruster 2021-11-15 8:03 ` [PATCH v2 2/2] vl: typo fix in a comment marcandre.lureau 2021-11-15 10:00 ` [PATCH v2 0/2] qemu-options: define -spice only #ifdef CONFIG_SPICE Philippe Mathieu-Daudé 2 siblings, 1 reply; 6+ messages in thread From: marcandre.lureau @ 2021-11-15 8:03 UTC (permalink / raw) To: qemu-devel; +Cc: Paolo Bonzini, berrange, armbru, Marc-André Lureau From: Marc-André Lureau <marcandre.lureau@redhat.com> Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1982600 Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- softmmu/vl.c | 2 ++ qemu-options.hx | 2 ++ 2 files changed, 4 insertions(+) diff --git a/softmmu/vl.c b/softmmu/vl.c index 1159a64bce4e..385465fbeb6d 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3538,6 +3538,7 @@ void qemu_init(int argc, char **argv, char **envp) case QEMU_OPTION_readconfig: qemu_read_config_file(optarg, qemu_parse_config_group, &error_fatal); break; +#ifdef CONFIG_SPICE case QEMU_OPTION_spice: olist = qemu_find_opts_err("spice", NULL); if (!olist) { @@ -3550,6 +3551,7 @@ void qemu_init(int argc, char **argv, char **envp) } display_remote++; break; +#endif case QEMU_OPTION_writeconfig: { FILE *fp; diff --git a/qemu-options.hx b/qemu-options.hx index 7749f59300b5..323913945a5d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2017,6 +2017,7 @@ SRST Enable SDL. ERST +#ifdef CONFIG_SPICE DEF("spice", HAS_ARG, QEMU_OPTION_spice, "-spice [port=port][,tls-port=secured-port][,x509-dir=<dir>]\n" " [,x509-key-file=<file>][,x509-key-password=<file>]\n" @@ -2038,6 +2039,7 @@ DEF("spice", HAS_ARG, QEMU_OPTION_spice, " enable spice\n" " at least one of {port, tls-port} is mandatory\n", QEMU_ARCH_ALL) +#endif SRST ``-spice option[,option[,...]]`` Enable the spice remote desktop protocol. Valid options are -- 2.33.0.721.g106298f7f9 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] qemu-options: define -spice only #ifdef CONFIG_SPICE 2021-11-15 8:03 ` [PATCH v2 1/2] " marcandre.lureau @ 2021-11-18 11:58 ` Markus Armbruster 2021-11-18 14:14 ` Marc-André Lureau 0 siblings, 1 reply; 6+ messages in thread From: Markus Armbruster @ 2021-11-18 11:58 UTC (permalink / raw) To: marcandre.lureau; +Cc: Paolo Bonzini, berrange, qemu-devel marcandre.lureau@redhat.com writes: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > Fixes: > https://bugzilla.redhat.com/show_bug.cgi?id=1982600 > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > softmmu/vl.c | 2 ++ > qemu-options.hx | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/softmmu/vl.c b/softmmu/vl.c > index 1159a64bce4e..385465fbeb6d 100644 > --- a/softmmu/vl.c > +++ b/softmmu/vl.c > @@ -3538,6 +3538,7 @@ void qemu_init(int argc, char **argv, char **envp) > case QEMU_OPTION_readconfig: > qemu_read_config_file(optarg, qemu_parse_config_group, &error_fatal); > break; > +#ifdef CONFIG_SPICE > case QEMU_OPTION_spice: > olist = qemu_find_opts_err("spice", NULL); > if (!olist) { error_report("spice support is disabled"); exit(1); } Is this error still reachable? > @@ -3550,6 +3551,7 @@ void qemu_init(int argc, char **argv, char **envp) > } > display_remote++; > break; > +#endif > case QEMU_OPTION_writeconfig: > { > FILE *fp; > diff --git a/qemu-options.hx b/qemu-options.hx > index 7749f59300b5..323913945a5d 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -2017,6 +2017,7 @@ SRST > Enable SDL. > ERST > > +#ifdef CONFIG_SPICE > DEF("spice", HAS_ARG, QEMU_OPTION_spice, > "-spice [port=port][,tls-port=secured-port][,x509-dir=<dir>]\n" > " [,x509-key-file=<file>][,x509-key-password=<file>]\n" > @@ -2038,6 +2039,7 @@ DEF("spice", HAS_ARG, QEMU_OPTION_spice, > " enable spice\n" > " at least one of {port, tls-port} is mandatory\n", > QEMU_ARCH_ALL) > +#endif > SRST > ``-spice option[,option[,...]]`` > Enable the spice remote desktop protocol. Valid options are ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] qemu-options: define -spice only #ifdef CONFIG_SPICE 2021-11-18 11:58 ` Markus Armbruster @ 2021-11-18 14:14 ` Marc-André Lureau 0 siblings, 0 replies; 6+ messages in thread From: Marc-André Lureau @ 2021-11-18 14:14 UTC (permalink / raw) To: Markus Armbruster; +Cc: Paolo Bonzini, P. Berrange, Daniel, qemu-devel Hi On Thu, Nov 18, 2021 at 3:58 PM Markus Armbruster <armbru@redhat.com> wrote: > > marcandre.lureau@redhat.com writes: > > > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > > > Fixes: > > https://bugzilla.redhat.com/show_bug.cgi?id=1982600 > > > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > > --- > > softmmu/vl.c | 2 ++ > > qemu-options.hx | 2 ++ > > 2 files changed, 4 insertions(+) > > > > diff --git a/softmmu/vl.c b/softmmu/vl.c > > index 1159a64bce4e..385465fbeb6d 100644 > > --- a/softmmu/vl.c > > +++ b/softmmu/vl.c > > @@ -3538,6 +3538,7 @@ void qemu_init(int argc, char **argv, char **envp) > > case QEMU_OPTION_readconfig: > > qemu_read_config_file(optarg, qemu_parse_config_group, &error_fatal); > > break; > > +#ifdef CONFIG_SPICE > > case QEMU_OPTION_spice: > > olist = qemu_find_opts_err("spice", NULL); > > if (!olist) { > error_report("spice support is disabled"); > exit(1); > } > > Is this error still reachable? I wonder if module loading failed, it's non fatal and will report this error. > > > @@ -3550,6 +3551,7 @@ void qemu_init(int argc, char **argv, char **envp) > > } > > display_remote++; > > break; > > +#endif > > case QEMU_OPTION_writeconfig: > > { > > FILE *fp; > > diff --git a/qemu-options.hx b/qemu-options.hx > > index 7749f59300b5..323913945a5d 100644 > > --- a/qemu-options.hx > > +++ b/qemu-options.hx > > @@ -2017,6 +2017,7 @@ SRST > > Enable SDL. > > ERST > > > > +#ifdef CONFIG_SPICE > > DEF("spice", HAS_ARG, QEMU_OPTION_spice, > > "-spice [port=port][,tls-port=secured-port][,x509-dir=<dir>]\n" > > " [,x509-key-file=<file>][,x509-key-password=<file>]\n" > > @@ -2038,6 +2039,7 @@ DEF("spice", HAS_ARG, QEMU_OPTION_spice, > > " enable spice\n" > > " at least one of {port, tls-port} is mandatory\n", > > QEMU_ARCH_ALL) > > +#endif > > SRST > > ``-spice option[,option[,...]]`` > > Enable the spice remote desktop protocol. Valid options are > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] vl: typo fix in a comment 2021-11-15 8:03 [PATCH v2 0/2] qemu-options: define -spice only #ifdef CONFIG_SPICE marcandre.lureau 2021-11-15 8:03 ` [PATCH v2 1/2] " marcandre.lureau @ 2021-11-15 8:03 ` marcandre.lureau 2021-11-15 10:00 ` [PATCH v2 0/2] qemu-options: define -spice only #ifdef CONFIG_SPICE Philippe Mathieu-Daudé 2 siblings, 0 replies; 6+ messages in thread From: marcandre.lureau @ 2021-11-15 8:03 UTC (permalink / raw) To: qemu-devel; +Cc: Paolo Bonzini, berrange, armbru, Marc-André Lureau From: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- softmmu/vl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index 385465fbeb6d..c584836c231e 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1957,7 +1957,7 @@ static void qemu_create_early_backends(void) object_option_foreach_add(object_create_early); /* spice needs the timers to be initialized by this point */ - /* spice must initialize before audio as it changes the default auiodev */ + /* spice must initialize before audio as it changes the default audiodev */ /* spice must initialize before chardevs (for spicevmc and spiceport) */ qemu_spice.init(); -- 2.33.0.721.g106298f7f9 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 0/2] qemu-options: define -spice only #ifdef CONFIG_SPICE 2021-11-15 8:03 [PATCH v2 0/2] qemu-options: define -spice only #ifdef CONFIG_SPICE marcandre.lureau 2021-11-15 8:03 ` [PATCH v2 1/2] " marcandre.lureau 2021-11-15 8:03 ` [PATCH v2 2/2] vl: typo fix in a comment marcandre.lureau @ 2021-11-15 10:00 ` Philippe Mathieu-Daudé 2 siblings, 0 replies; 6+ messages in thread From: Philippe Mathieu-Daudé @ 2021-11-15 10:00 UTC (permalink / raw) To: marcandre.lureau, qemu-devel; +Cc: Paolo Bonzini, berrange, armbru On 11/15/21 09:03, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > Marc-André Lureau (2): > qemu-options: define -spice only #ifdef CONFIG_SPICE > vl: typo fix in a comment Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-11-18 14:15 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-11-15 8:03 [PATCH v2 0/2] qemu-options: define -spice only #ifdef CONFIG_SPICE marcandre.lureau 2021-11-15 8:03 ` [PATCH v2 1/2] " marcandre.lureau 2021-11-18 11:58 ` Markus Armbruster 2021-11-18 14:14 ` Marc-André Lureau 2021-11-15 8:03 ` [PATCH v2 2/2] vl: typo fix in a comment marcandre.lureau 2021-11-15 10:00 ` [PATCH v2 0/2] qemu-options: define -spice only #ifdef CONFIG_SPICE Philippe Mathieu-Daudé
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).