qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Capitulino <lcapitulino@redhat.com>
To: jforbes@redhat.com
Cc: TeLeMan <geleman@gmail.com>,
	Anthony Liguori <aliguori@us.ibm.com>,
	qemu-devel@nongnu.org
Subject: [Qemu-devel] [STABLE 3/4] monitor: fix build breakage with --disable-vnc
Date: Fri, 16 Sep 2011 13:30:18 -0300	[thread overview]
Message-ID: <1316190619-4611-4-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1316190619-4611-1-git-send-email-lcapitulino@redhat.com>

From: TeLeMan <geleman@gmail.com>

The breakage was introduced by the commit 13661089810d3e59931f3e80d7cb541b99af7071

Signed-off-by: TeLeMan <geleman@gmail.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(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) {
-- 
1.7.7.rc0.72.g4b5ea

  parent reply	other threads:[~2011-09-16 17:29 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-16 16:30 [Qemu-devel] [STABLE 0/4]: QMP/Monitor stable branch fixes Luiz Capitulino
2011-09-16 16:30 ` [Qemu-devel] [STABLE 1/4] configure: Copy test data to build directory Luiz Capitulino
2011-09-16 16:30 ` [Qemu-devel] [STABLE 2/4] Fix qjson test of solidus encoding Luiz Capitulino
2011-09-16 16:30 ` Luiz Capitulino [this message]
2011-09-16 17:40   ` [Qemu-devel] [STABLE 3/4] monitor: fix build breakage with --disable-vnc Justin M. Forbes
2011-09-16 18:00     ` Luiz Capitulino
2011-09-16 16:30 ` [Qemu-devel] [STABLE 4/4] monitor: fix build breakage for !CONFIG_VNC Luiz Capitulino

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1316190619-4611-4-git-send-email-lcapitulino@redhat.com \
    --to=lcapitulino@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=geleman@gmail.com \
    --cc=jforbes@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).