openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qmp/queue/monitor' into staging

This commit is contained in:
Anthony Liguori 2011-08-29 08:48:07 -05:00
parent 9f94778c16 860341f605
commit 8d76d4befb
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