]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'luiz/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 2 Apr 2013 19:07:35 +0000 (14:07 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 2 Apr 2013 19:07:35 +0000 (14:07 -0500)
# 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()

1  2 
qemu-char.c

diff --cc qemu-char.c
Simple merge