Patchwork monitor: fix build breakage for !CONFIG_VNC

login
register
mail settings
Submitter Luiz Capitulino
Date Aug. 25, 2011, 4:41 p.m.
Message ID <1314290487-28814-2-git-send-email-lcapitulino@redhat.com>
Download mbox | patch
Permalink /patch/111622/
State New
Headers show

Comments

Luiz Capitulino - Aug. 25, 2011, 4:41 p.m.
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>
---
 monitor.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/monitor.c b/monitor.c
index ada51d0..04f465a 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