From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:36832)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1Qrc0N-0005SK-4c
	for qemu-devel@nongnu.org; Thu, 11 Aug 2011 16:37:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1Qrc0L-00042S-NU
	for qemu-devel@nongnu.org; Thu, 11 Aug 2011 16:37:27 -0400
Received: from mx1.redhat.com ([209.132.183.28]:58667)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1Qrc0L-00042K-8M
	for qemu-devel@nongnu.org; Thu, 11 Aug 2011 16:37:25 -0400
Date: Thu, 11 Aug 2011 17:37:17 -0300
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20110811173717.5679ce9a@doriath>
In-Reply-To: <1312985922-9785-1-git-send-email-jamie@jamieiles.com>
References: <1312985922-9785-1-git-send-email-jamie@jamieiles.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] monitor: fix build breakage for !CONFIG_VNC
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Jamie Iles <jamie@jamieiles.com>
Cc: qemu-devel@nongnu.org, Markus Armbruster <armbru@redhat.com>

On Wed, 10 Aug 2011 15:18:42 +0100
Jamie Iles <jamie@jamieiles.com> wrote:

> 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 <lcapitulino@redhat.com>
> Cc: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Jamie Iles <jamie@jamieiles.com>

Applied to the monitor branch, thanks.

> ---
>  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