From patchwork Thu Aug 25 16:41:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 111622 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3C473B6F71 for ; Fri, 26 Aug 2011 02:41:58 +1000 (EST) Received: from localhost ([::1]:59215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qwd02-000493-Iq for incoming@patchwork.ozlabs.org; Thu, 25 Aug 2011 12:41:50 -0400 Received: from eggs.gnu.org ([140.186.70.92]:59585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qwczv-00040k-Bi for qemu-devel@nongnu.org; Thu, 25 Aug 2011 12:41:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qwczt-0004kI-V7 for qemu-devel@nongnu.org; Thu, 25 Aug 2011 12:41:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50856) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qwczt-0004kE-O2 for qemu-devel@nongnu.org; Thu, 25 Aug 2011 12:41:41 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7PGfd9R023657 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 25 Aug 2011 12:41:39 -0400 Received: from localhost (ovpn-113-55.phx2.redhat.com [10.3.113.55]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p7PGfbxm009389; Thu, 25 Aug 2011 12:41:38 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 25 Aug 2011 13:41:27 -0300 Message-Id: <1314290487-28814-2-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1314290487-28814-1-git-send-email-lcapitulino@redhat.com> References: <1314290487-28814-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Jamie Iles , aliguori@us.ibm.com, Markus Armbruster Subject: [Qemu-devel] [PATCH] monitor: fix build breakage for !CONFIG_VNC 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 From: Jamie Iles Commit c62f6d1 (monitor: fix build breakage with --disable-vnc) conditionalised some VNC setup code but left an unused variable. Move the variable into the conditional code to fix the build breakage. Cc: Luiz Capitulino Cc: Markus Armbruster Signed-off-by: Jamie Iles Signed-off-by: Luiz Capitulino --- monitor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/monitor.c b/monitor.c index ada51d0..04f465a 100644 --- a/monitor.c +++ b/monitor.c @@ -1189,7 +1189,6 @@ static int add_graphics_client(Monitor *mon, const QDict *qdict, QObject **ret_d { const char *protocol = qdict_get_str(qdict, "protocol"); const char *fdname = qdict_get_str(qdict, "fdname"); - int skipauth = qdict_get_try_bool(qdict, "skipauth", 0); CharDriverState *s; if (strcmp(protocol, "spice") == 0) { @@ -1203,6 +1202,7 @@ static int add_graphics_client(Monitor *mon, const QDict *qdict, QObject **ret_d #ifdef CONFIG_VNC } else if (strcmp(protocol, "vnc") == 0) { int fd = monitor_get_fd(mon, fdname); + int skipauth = qdict_get_try_bool(qdict, "skipauth", 0); vnc_display_add_client(NULL, fd, skipauth); return 0; #endif