aboutsummaryrefslogtreecommitdiff
path: root/util/oslib-win32.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-04-02 14:07:35 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-04-02 14:07:35 -0500
commit162cbbd1736de2bca43fdefa7e98c54a361ee60d (patch)
treeb61fbd71c097e8f6447a785132fb12f973e73e24 /util/oslib-win32.c
parent9d4563c415683e4d06c84a46e8d178a680fdcb7b (diff)
parent9b938c7262e403f5467110609cb20ef1ae6e9df2 (diff)
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()
Diffstat (limited to 'util/oslib-win32.c')
-rw-r--r--util/oslib-win32.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 640194c0cf..dcfa0c2918 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -100,14 +100,14 @@ struct tm *localtime_r(const time_t *timep, struct tm *result)
return p;
}
-void socket_set_block(int fd)
+void qemu_set_block(int fd)
{
unsigned long opt = 0;
WSAEventSelect(fd, NULL, 0);
ioctlsocket(fd, FIONBIO, &opt);
}
-void socket_set_nonblock(int fd)
+void qemu_set_nonblock(int fd)
{
unsigned long opt = 1;
ioctlsocket(fd, FIONBIO, &opt);