Patchwork gtk ui: unbreak spice

login
register
mail settings
Submitter Gerd Hoffmann
Date Feb. 25, 2013, 3:02 p.m.
Message ID <1361804550-15858-1-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/222928/
State New
Headers show

Comments

Gerd Hoffmann - Feb. 25, 2013, 3:02 p.m.
Merge of the gtk ui brought a initialitation order issue for spice:
The using_spice variable isn't set yet when checked, leading to the
default UI being activated (additionally to spice remote access).

Let's set display_remote when we find a -spice switch on the command
line, like we do for vnc.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 vl.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
Anthony Liguori - Feb. 27, 2013, 1:28 p.m.
Applied.  Thanks.

Regards,

Anthony Liguori

Patch

diff --git a/vl.c b/vl.c
index 0da156e..febd2ea 100644
--- a/vl.c
+++ b/vl.c
@@ -3767,6 +3767,7 @@  int main(int argc, char **argv, char **envp)
                 if (!opts) {
                     exit(1);
                 }
+                display_remote++;
                 break;
             case QEMU_OPTION_writeconfig:
                 {
@@ -4006,9 +4007,6 @@  int main(int argc, char **argv, char **envp)
         }
     }
 
-    if (using_spice) {
-        display_remote++;
-    }
     if (display_type == DT_DEFAULT && !display_remote) {
 #if defined(CONFIG_GTK)
         display_type = DT_GTK;