From: Luiz Capitulino <lcapitulino@redhat.com>
To: jforbes@redhat.com
Cc: Jamie Iles <jamie@jamieiles.com>,
qemu-devel@nongnu.org, Markus Armbruster <armbru@redhat.com>
Subject: [Qemu-devel] [STABLE 4/4] monitor: fix build breakage for !CONFIG_VNC
Date: Fri, 16 Sep 2011 13:30:19 -0300 [thread overview]
Message-ID: <1316190619-4611-5-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1316190619-4611-1-git-send-email-lcapitulino@redhat.com>
From: Jamie Iles <jamie@jamieiles.com>
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>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
(cherry picked from commit 860341f60582959698d2e1d839a5b7a004a2d76f)
---
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.7.rc0.72.g4b5ea
prev parent reply other threads:[~2011-09-16 17:34 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 ` [Qemu-devel] [STABLE 3/4] monitor: fix build breakage with --disable-vnc Luiz Capitulino
2011-09-16 17:40 ` Justin M. Forbes
2011-09-16 18:00 ` Luiz Capitulino
2011-09-16 16:30 ` Luiz Capitulino [this message]
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-5-git-send-email-lcapitulino@redhat.com \
--to=lcapitulino@redhat.com \
--cc=armbru@redhat.com \
--cc=jamie@jamieiles.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).