From patchwork Mon Feb 25 15:02:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 222928 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 342572C02B5 for ; Tue, 26 Feb 2013 02:02:52 +1100 (EST) Received: from localhost ([::1]:45855 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9zZq-0006bD-DM for incoming@patchwork.ozlabs.org; Mon, 25 Feb 2013 10:02:50 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9zZg-0006as-Lr for qemu-devel@nongnu.org; Mon, 25 Feb 2013 10:02:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U9zZZ-0001bS-AE for qemu-devel@nongnu.org; Mon, 25 Feb 2013 10:02:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:18407) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9zZZ-0001b4-2g for qemu-devel@nongnu.org; Mon, 25 Feb 2013 10:02:33 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1PF2WQD031836 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 25 Feb 2013 10:02:32 -0500 Received: from rincewind.home.kraxel.org (ovpn-116-23.ams2.redhat.com [10.36.116.23]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r1PF2VUO013400; Mon, 25 Feb 2013 10:02:32 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 0581B42DEC; Mon, 25 Feb 2013 16:02:30 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 25 Feb 2013 16:02:30 +0100 Message-Id: <1361804550-15858-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Gerd Hoffmann Subject: [Qemu-devel] [PATCH] gtk ui: unbreak spice X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- vl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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;