mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
Merge remote-tracking branch 'luiz/queue/qmp' into staging
# By Stefan Hajnoczi # Via Luiz Capitulino * luiz/queue/qmp: chardev: clear O_NONBLOCK on SCM_RIGHTS file descriptors qemu-socket: set passed fd non-blocking in socket_connect() net: ensure "socket" backend uses non-blocking fds oslib-posix: rename socket_set_nonblock() to qemu_set_nonblock()
This commit is contained in:
commit
162cbbd173
14 changed files with 37 additions and 28 deletions
2
ui/vnc.c
2
ui/vnc.c
|
@ -2732,7 +2732,7 @@ static void vnc_connect(VncDisplay *vd, int csock, int skipauth, bool websocket)
|
|||
|
||||
VNC_DEBUG("New client on socket %d\n", csock);
|
||||
vd->dcl.idle = 0;
|
||||
socket_set_nonblock(vs->csock);
|
||||
qemu_set_nonblock(vs->csock);
|
||||
#ifdef CONFIG_VNC_WS
|
||||
if (websocket) {
|
||||
vs->websocket = 1;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue