projects
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
56a7a87
)
monitor: fix build breakage for !CONFIG_VNC
author
Jamie Iles
<jamie@jamieiles.com>
Wed, 10 Aug 2011 14:18:42 +0000
(15:18 +0100)
committer
Luiz Capitulino
<lcapitulino@redhat.com>
Thu, 25 Aug 2011 15:40:07 +0000
(12:40 -0300)
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
patch
|
blob
|
history
diff --git
a/monitor.c
b/monitor.c
index ada51d0c232e025bd5e1f1cab639358e379fce05..04f465aa1c151aa0e09ce6bf0b54b5fb190624b6 100644
(file)
--- 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