[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [STABLE 4/4] monitor: fix build breakage for !CONFIG_VNC
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [STABLE 4/4] monitor: fix build breakage for !CONFIG_VNC |
Date: |
Fri, 16 Sep 2011 13:30:19 -0300 |
From: Jamie Iles <address@hidden>
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 <address@hidden>
Cc: Markus Armbruster <address@hidden>
Signed-off-by: Jamie Iles <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
(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