diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-29 08:48:07 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-29 08:48:07 -0500 |
commit | 8d76d4befbdde3a5a50f68512671494b76d74ad2 (patch) | |
tree | b400b4f883cc736abeedac65e8e063c9a496d1ef | |
parent | 9f94778c1603420e48d779a495e84eb82945cc75 (diff) | |
parent | 860341f60582959698d2e1d839a5b7a004a2d76f (diff) |
Merge remote-tracking branch 'qmp/queue/monitor' into staging
-rw-r--r-- | monitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |