diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-02-21 16:47:52 +0400 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-03-13 15:23:37 +0400 |
| commit | a4aafea26152b58c61c8105ffc574661cdfeb17b (patch) | |
| tree | ef3d02c05fd0e5574c2132327b3bf7b54d5a2743 | |
| parent | f5fd677ae7cf7cfb07b12adbfd479c460ddc3ac5 (diff) | |
win32/socket: introduce qemu_socket_unselect() helper
A more explicit version of qemu_socket_select() with no events.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Message-Id: <20230221124802.4103554-8-marcandre.lureau@redhat.com>
| -rw-r--r-- | include/sysemu/os-win32.h | 2 | ||||
| -rw-r--r-- | io/channel-socket.c | 4 | ||||
| -rw-r--r-- | util/oslib-win32.c | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h index 9f842ae643..504a8966c3 100644 --- a/include/sysemu/os-win32.h +++ b/include/sysemu/os-win32.h @@ -169,6 +169,8 @@ static inline void qemu_funlockfile(FILE *f) bool qemu_socket_select(SOCKET s, WSAEVENT hEventObject, long lNetworkEvents, Error **errp); +bool qemu_socket_unselect(SOCKET s, Error **errp); + /* We wrap all the sockets functions so that we can * set errno based on WSAGetLastError() */ diff --git a/io/channel-socket.c b/io/channel-socket.c index 0bc29c4808..03757c7a7e 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -442,7 +442,7 @@ static void qio_channel_socket_finalize(Object *obj) } } #ifdef WIN32 - qemu_socket_select(ioc->fd, NULL, 0, NULL); + qemu_socket_unselect(ioc->fd, NULL); #endif closesocket(ioc->fd); ioc->fd = -1; @@ -846,7 +846,7 @@ qio_channel_socket_close(QIOChannel *ioc, if (sioc->fd != -1) { #ifdef WIN32 - qemu_socket_select(sioc->fd, NULL, 0, NULL); + qemu_socket_unselect(sioc->fd, NULL); #endif if (qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_LISTEN)) { socket_listen_cleanup(sioc->fd, errp); diff --git a/util/oslib-win32.c b/util/oslib-win32.c index df752fc762..dbd32acc98 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -180,7 +180,7 @@ static int socket_error(void) void qemu_socket_set_block(int fd) { unsigned long opt = 0; - qemu_socket_select(fd, NULL, 0, NULL); + qemu_socket_unselect(fd, NULL); ioctlsocket(fd, FIONBIO, &opt); } @@ -298,6 +298,11 @@ bool qemu_socket_select(SOCKET s, WSAEVENT hEventObject, return true; } +bool qemu_socket_unselect(SOCKET s, Error **errp) +{ + return qemu_socket_select(s, NULL, 0, errp); +} + #undef connect int qemu_connect_wrap(int sockfd, const struct sockaddr *addr, socklen_t addrlen) |