commit f963e4d0ca5b7704aed8048e2bc293597d333dfb
author Gerd Hoffmann <kraxel@redhat.com> Mon Feb 25 16:02:30 2013 +0100
committer Anthony Liguori <aliguori@us.ibm.com> Tue Feb 26 13:26:16 2013 -0600
tree 9bad2ac4b38fd5f88ddc92079e9fa5cccfb119c6
parent 864a556e9a800116a305f10fbb714268ca7e9bc3

gtk ui: unbreak spice

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>
Message-id: 1361804550-15858-1-git-send-email-kraxel@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

vl.c

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