@errp is always NULL. Remove it, as unused. Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> --- include/system/os-win32.h | 2 +- io/channel-socket.c | 4 ++-- util/oslib-win32.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/system/os-win32.h b/include/system/os-win32.h index 3aa6cee4c23..40712a948c3 100644 --- a/include/system/os-win32.h +++ b/include/system/os-win32.h @@ -172,7 +172,7 @@ static inline void qemu_funlockfile(FILE *f) bool qemu_socket_select(int sockfd, WSAEVENT hEventObject, long lNetworkEvents, Error **errp); -bool qemu_socket_unselect(int sockfd, Error **errp); +bool qemu_socket_unselect(int sockfd); /* We wrap all the sockets functions so that we can set errno based on * WSAGetLastError(), and use file-descriptors instead of SOCKET. diff --git a/io/channel-socket.c b/io/channel-socket.c index 3b7ca924ff3..6ee6217e7ac 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -454,7 +454,7 @@ static void qio_channel_socket_finalize(Object *obj) } } #ifdef WIN32 - qemu_socket_unselect(ioc->fd, NULL); + qemu_socket_unselect(ioc->fd); #endif close(ioc->fd); ioc->fd = -1; @@ -890,7 +890,7 @@ qio_channel_socket_close(QIOChannel *ioc, if (sioc->fd != -1) { #ifdef WIN32 - qemu_socket_unselect(sioc->fd, NULL); + qemu_socket_unselect(sioc->fd); #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 b7351634ece..7ac3482d449 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_unselect(fd, NULL); + qemu_socket_unselect(fd); ioctlsocket(fd, FIONBIO, &opt); } @@ -313,9 +313,9 @@ bool qemu_socket_select(int sockfd, WSAEVENT hEventObject, return true; } -bool qemu_socket_unselect(int sockfd, Error **errp) +bool qemu_socket_unselect(int sockfd) { - return qemu_socket_select(sockfd, NULL, 0, errp); + return qemu_socket_select(sockfd, NULL, 0, NULL); } int qemu_socketpair(int domain, int type, int protocol, int sv[2]) -- 2.49.0