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)
commit162cbbd1736de2bca43fdefa7e98c54a361ee60d
treeb61fbd71c097e8f6447a785132fb12f973e73e24
parent9d4563c415683e4d06c84a46e8d178a680fdcb7b
parent9b938c7262e403f5467110609cb20ef1ae6e9df2
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()
qemu-char.c