[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/19] add socket_set_block
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 02/19] add socket_set_block |
Date: |
Fri, 21 Oct 2011 19:18:59 +0200 |
From: Paolo Bonzini <address@hidden>
Cc: MORITA Kazutaka <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
oslib-posix.c | 7 +++++++
oslib-win32.c | 6 ++++++
qemu_socket.h | 1 +
3 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/oslib-posix.c b/oslib-posix.c
index a304fb0..dbc8ee8 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 5f0759f..5e3de7d 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 180e4db..9e32fac 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);
--
1.7.6.4
- [Qemu-devel] [PULL 00/19] Block patches, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 01/19] sheepdog: add coroutine_fn markers, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 02/19] add socket_set_block,
Kevin Wolf <=
- [Qemu-devel] [PATCH 03/19] block: rename bdrv_co_rw_bh, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 04/19] fix memory leak in aio_write_f, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 05/19] xen_disk: Always set feature-barrier = 1, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 08/19] block: add bdrv_co_discard and bdrv_aio_discard support, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 06/19] block: unify flush implementations, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 10/19] qemu-img: Don't allow preallocation and compression at the same time, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 09/19] fdc: Fix floppy port I/O, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 11/19] qcow2: Fix bdrv_write_compressed error handling, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 07/19] block: drop redundant bdrv_flush implementation, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 12/19] pc: Fix floppy drives with if=none, Kevin Wolf, 2011/10/21