vl: add missing display_remote++

Commit Message

Marc-André Lureau Nov. 17, 2023, 2:17 p.m. UTC

From: Marc-André Lureau <[e-mail]>

We should also consider -display vnc= as setting up a remote display,
and not attempt to add another default one.

The display_remote++ in qemu_setup_display() isn't necessary at this
point, but is there for completeness and further usages of the variable.

Signed-off-by: Marc-André Lureau <[e-mail]>
---
 system/vl.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Marc-André Lureau Nov. 21, 2023, 6:45 a.m. UTC | #1

Hi

On Fri, Nov 17, 2023 at 6:18 PM <[e-mail]> wrote:
>
> From: Marc-André Lureau <[e-mail]>
>
> We should also consider -display vnc= as setting up a remote display,
> and not attempt to add another default one.
>
> The display_remote++ in qemu_setup_display() isn't necessary at this
> point, but is there for completeness and further usages of the variable.
>
> Signed-off-by: Marc-André Lureau <[e-mail]>

It turns out this fixes a regression:
https://gitlab.com/qemu-project/qemu/-/issues/1988

Fixes: 484629fc81 ("vl: simplify display_remote logic ")

> ---
>  system/vl.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/system/vl.c b/system/vl.c
> index 5af7ced2a1..f95ae77b5a 100644
> --- a/system/vl.c
> +++ b/system/vl.c
> @@ -1110,6 +1110,7 @@ static void parse_display(const char *p)
>           */
>          if (*opts == '=') {
>              vnc_parse(opts + 1);
> +            display_remote++;
>          } else {
>              error_report("VNC requires a display argument vnc=<display>");
>              exit(1);
> @@ -1359,6 +1360,7 @@ static void qemu_setup_display(void)
>              dpy.type = DISPLAY_TYPE_NONE;
>  #if defined(CONFIG_VNC)
>              vnc_parse("localhost:0,to=99,id=default");
> +            display_remote++;
>  #endif
>          }
>      }
> --
> 2.41.0
>
>

Patch

diff --git a/system/vl.c b/system/vl.c
index 5af7ced2a1..f95ae77b5a 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -1110,6 +1110,7 @@  static void parse_display(const char *p)
          */
         if (*opts == '=') {
             vnc_parse(opts + 1);
+            display_remote++;
         } else {
             error_report("VNC requires a display argument vnc=<display>");
             exit(1);
@@ -1359,6 +1360,7 @@  static void qemu_setup_display(void)
             dpy.type = DISPLAY_TYPE_NONE;
 #if defined(CONFIG_VNC)
             vnc_parse("localhost:0,to=99,id=default");
+            display_remote++;
 #endif
         }
     }