From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:47087)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1QmoAo-0001hN-F7
	for qemu-devel@nongnu.org; Fri, 29 Jul 2011 10:36:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1QmoAn-0006Md-Dw
	for qemu-devel@nongnu.org; Fri, 29 Jul 2011 10:36:22 -0400
Message-ID: <4E32C560.2020001@redhat.com>
Date: Fri, 29 Jul 2011 09:36:16 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <1311582554-963-1-git-send-email-geleman@gmail.com>
In-Reply-To: <1311582554-963-1-git-send-email-geleman@gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] monitor: fix build breakage with
	--disable-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: TeLeMan <geleman@gmail.com>
Cc: qemu-trivial@nongnu.org, qemu-devel <qemu-devel@nongnu.org>

On 07/25/2011 03:29 AM, TeLeMan wrote:
> The breakage was introduced by the commit 13661089810d3e59931f3e80d7cb541b99af7071
>
> Signed-off-by: TeLeMan<geleman@gmail.com>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>   monitor.c |    2 ++
>   1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/monitor.c b/monitor.c
> index 92cdd05..52ae5f2 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -1200,10 +1200,12 @@ static int add_graphics_client(Monitor *mon, const QDict *qdict, QObject **ret_d
>           }
>   	qerror_report(QERR_ADD_CLIENT_FAILED);
>   	return -1;
> +#ifdef CONFIG_VNC
>       } else if (strcmp(protocol, "vnc") == 0) {
>   	int fd = monitor_get_fd(mon, fdname);
>   	vnc_display_add_client(NULL, fd, skipauth);
>   	return 0;
> +#endif
>       } else if ((s = qemu_chr_find(protocol)) != NULL) {
>   	int fd = monitor_get_fd(mon, fdname);
>   	if (qemu_chr_add_client(s, fd)<  0) {