[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] qemu-options.hx: remove -spice options from --help
From: |
Markus Armbruster |
Subject: |
Re: [PATCH] qemu-options.hx: remove -spice options from --help |
Date: |
Thu, 09 Sep 2021 11:42:28 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) |
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 | 4 +++-
> qemu-options.hx | 2 ++
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/softmmu/vl.c b/softmmu/vl.c
> index 55ab70eb97..1e60d286b9 100644
> --- a/softmmu/vl.c
> +++ b/softmmu/vl.c
> @@ -1931,7 +1931,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();
>
> @@ -3488,6 +3488,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) {
> @@ -3500,6 +3501,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 8f603cc7e6..204028408c 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -2003,6 +2003,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"
> @@ -2024,6 +2025,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
The scary-looking subject lies: you're removing only when CONFIG_SPICE
is off. Suggest "qemu-options: Define -spice only #ifdef CONFIG_SPICE".