From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4cIa-0001Li-Pw for qemu-devel@nongnu.org; Fri, 16 Sep 2011 13:34:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R4cIZ-0006QF-F7 for qemu-devel@nongnu.org; Fri, 16 Sep 2011 13:34:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24442) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4cIZ-0006Of-61 for qemu-devel@nongnu.org; Fri, 16 Sep 2011 13:33:59 -0400 From: Luiz Capitulino Date: Fri, 16 Sep 2011 13:30:19 -0300 Message-Id: <1316190619-4611-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1316190619-4611-1-git-send-email-lcapitulino@redhat.com> References: <1316190619-4611-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [STABLE 4/4] monitor: fix build breakage for !CONFIG_VNC List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: jforbes@redhat.com Cc: Jamie Iles , qemu-devel@nongnu.org, Markus Armbruster 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 (cherry picked from commit 860341f60582959698d2e1d839a5b7a004a2d76f) --- monitor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/monitor.c b/monitor.c index 1b8ba2c..fee572c 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 -- 1.7.7.rc0.72.g4b5ea