summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2011-10-05 09:17:32 +0200
committerKevin Wolf <kwolf@redhat.com>2011-10-21 17:34:12 +0200
commit154b9a0cbd67be53afcb45ae84a240add8c6cb67 (patch)
tree70f98a37b189f326a79a0987d2b31b6b15f465f4
parentd8716b41b9bd2c7ce6fe36ab388de534ce81a69a (diff)
downloadfocaccia-qemu-154b9a0cbd67be53afcb45ae84a240add8c6cb67.tar.gz
focaccia-qemu-154b9a0cbd67be53afcb45ae84a240add8c6cb67.zip
add socket_set_block
Cc: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--oslib-posix.c7
-rw-r--r--oslib-win32.c6
-rw-r--r--qemu_socket.h1
3 files changed, 14 insertions, 0 deletions
diff --git a/oslib-posix.c b/oslib-posix.c
index a304fb0f53..dbc8ee8960 100644
--- a/oslib-posix.c
+++ b/oslib-posix.c
@@ -103,6 +103,13 @@ void qemu_vfree(void *ptr)
     free(ptr);
 }
 
+void socket_set_block(int fd)
+{
+    int f;
+    f = fcntl(fd, F_GETFL);
+    fcntl(fd, F_SETFL, f & ~O_NONBLOCK);
+}
+
 void socket_set_nonblock(int fd)
 {
     int f;
diff --git a/oslib-win32.c b/oslib-win32.c
index 5f0759ffc4..5e3de7dc8a 100644
--- a/oslib-win32.c
+++ b/oslib-win32.c
@@ -73,6 +73,12 @@ void qemu_vfree(void *ptr)
     VirtualFree(ptr, 0, MEM_RELEASE);
 }
 
+void socket_set_block(int fd)
+{
+    unsigned long opt = 0;
+    ioctlsocket(fd, FIONBIO, &opt);
+}
+
 void socket_set_nonblock(int fd)
 {
     unsigned long opt = 1;
diff --git a/qemu_socket.h b/qemu_socket.h
index 180e4dbd9b..9e32fac651 100644
--- a/qemu_socket.h
+++ b/qemu_socket.h
@@ -35,6 +35,7 @@ int inet_aton(const char *cp, struct in_addr *ia);
 /* misc helpers */
 int qemu_socket(int domain, int type, int protocol);
 int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen);
+void socket_set_block(int fd);
 void socket_set_nonblock(int fd);
 int send_all(int fd, const void *buf, int len1);