From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 2 Apr 2013 19:07:35 +0000 (-0500)
Subject: Merge remote-tracking branch 'luiz/queue/qmp' into staging
X-Git-Tag: v1.5.0-rc0~349
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=162cbbd1736de2bca43fdefa7e98c54a361ee60d;p=thirdparty%2Fqemu.git

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()
---

162cbbd1736de2bca43fdefa7e98c54a361ee60d