From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:37564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qr9cW-0001lC-4a for qemu-devel@nongnu.org; Wed, 10 Aug 2011 10:18:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qr9cQ-00033o-Tf for qemu-devel@nongnu.org; Wed, 10 Aug 2011 10:18:56 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:36180) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qr9cQ-00033X-MR for qemu-devel@nongnu.org; Wed, 10 Aug 2011 10:18:50 -0400 Received: by wyf22 with SMTP id 22so837332wyf.4 for ; Wed, 10 Aug 2011 07:18:48 -0700 (PDT) From: Jamie Iles Date: Wed, 10 Aug 2011 15:18:42 +0100 Message-Id: <1312985922-9785-1-git-send-email-jamie@jamieiles.com> Subject: [Qemu-devel] [PATCH] monitor: fix build breakage for !CONFIG_VNC List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jamie Iles , Markus Armbruster , Luiz Capitulino 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 --- 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.4.1