From patchwork Fri Sep 16 16:30:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 115013 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 F24AAB71AD for ; Sat, 17 Sep 2011 03:29:56 +1000 (EST) Received: from localhost ([::1]:36529 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4cEb-0005wp-M5 for incoming@patchwork.ozlabs.org; Fri, 16 Sep 2011 13:29:53 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49194) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4cEN-0005lz-Rs for qemu-devel@nongnu.org; Fri, 16 Sep 2011 13:29:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R4cEM-0005NN-Gj for qemu-devel@nongnu.org; Fri, 16 Sep 2011 13:29:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1033) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4cEL-0005N9-Vm for qemu-devel@nongnu.org; Fri, 16 Sep 2011 13:29:38 -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 p8GHTX6L015243 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 16 Sep 2011 13:29:36 -0400 Received: from localhost (ovpn-113-78.phx2.redhat.com [10.3.113.78]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p8GGUdmr020106; Fri, 16 Sep 2011 12:30:40 -0400 From: Luiz Capitulino To: jforbes@redhat.com Date: Fri, 16 Sep 2011 13:30:18 -0300 Message-Id: <1316190619-4611-4-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> 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: TeLeMan , Anthony Liguori , qemu-devel@nongnu.org Subject: [Qemu-devel] [STABLE 3/4] monitor: fix build breakage with --disable-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: TeLeMan The breakage was introduced by the commit 13661089810d3e59931f3e80d7cb541b99af7071 Signed-off-by: TeLeMan Signed-off-by: Anthony Liguori (cherry picked from commit c62f6d1d76aea587556c85b6b7b5c44167006264) --- monitor.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index 718935b..1b8ba2c 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) {