mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor: fix build breakage for !CONFIG_VNC

Browse Source 
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>
This commit is contained in:
Jamie Iles 2011-08-10 15:18:42 +01:00 committed by Justin M. Forbes
parent ff5acedd8f
commit e19a4e89ae
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monitor.c
View File

@ -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 *protocol = qdict_get_str(qdict, "protocol");
const char *fdname = qdict_get_str(qdict, "fdname"); const char *fdname = qdict_get_str(qdict, "fdname");
int skipauth = qdict_get_try_bool(qdict, "skipauth", 0);
CharDriverState *s; CharDriverState *s;
if (strcmp(protocol, "spice") == 0) { 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 #ifdef CONFIG_VNC
} else if (strcmp(protocol, "vnc") == 0) { } else if (strcmp(protocol, "vnc") == 0) {
int fd = monitor_get_fd(mon, fdname); int fd = monitor_get_fd(mon, fdname);
int skipauth = qdict_get_try_bool(qdict, "skipauth", 0);
vnc_display_add_client(NULL, fd, skipauth); vnc_display_add_client(NULL, fd, skipauth);
return 0; return 0;
#endif #endif