On Tue, Jul 15, 2025 at 10:35:17AM +0200, Philippe Mathieu-Daudé wrote:
> @errp is always NULL. Remove it, as unused.
>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
> ---
> include/system/os-win32.h | 2 +-
> util/aio-win32.c | 2 +-
> util/oslib-win32.c | 13 +++++--------
> 3 files changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/include/system/os-win32.h b/include/system/os-win32.h
> index 40712a948c3..47882bc2f49 100644
> --- a/include/system/os-win32.h
> +++ b/include/system/os-win32.h
> @@ -170,7 +170,7 @@ static inline void qemu_funlockfile(FILE *f)
>
> /* Helper for WSAEventSelect, to report errors */
> bool qemu_socket_select(int sockfd, WSAEVENT hEventObject,
> - long lNetworkEvents, Error **errp);
> + long lNetworkEvents);
>
> bool qemu_socket_unselect(int sockfd);
>
> diff --git a/util/aio-win32.c b/util/aio-win32.c
> index 6583d5c5f31..9c2f0fb86e7 100644
> --- a/util/aio-win32.c
> +++ b/util/aio-win32.c
> @@ -121,7 +121,7 @@ void aio_set_fd_handler(AioContext *ctx,
>
> QLIST_INSERT_HEAD_RCU(&ctx->aio_handlers, node, node);
> event = event_notifier_get_handle(&ctx->notifier);
> - qemu_socket_select(fd, event, bitmask, NULL);
> + qemu_socket_select(fd, event, bitmask);
This should likely be &error_abort, as we never expect this
to fail AFAICT.
> diff --git a/util/oslib-win32.c b/util/oslib-win32.c
> index 7ac3482d449..fed5ab14efb 100644
> --- a/util/oslib-win32.c
> +++ b/util/oslib-win32.c
> @@ -292,21 +292,18 @@ char *qemu_get_pid_name(pid_t pid)
>
>
> bool qemu_socket_select(int sockfd, WSAEVENT hEventObject,
> - long lNetworkEvents, Error **errp)
> + long lNetworkEvents)
> {
> SOCKET s = _get_osfhandle(sockfd);
>
> - if (errp == NULL) {
> - errp = &error_warn;
> - }
This pre-existing code should never have existed - the caller should
have decided this reporting policy by passing in &error_warn.
> -
> if (s == INVALID_SOCKET) {
> - error_setg(errp, "invalid socket fd=%d", sockfd);
> + error_setg(&error_warn, "invalid socket fd=%d", sockfd);
> return false;
> }
>
> if (WSAEventSelect(s, hEventObject, lNetworkEvents) != 0) {
> - error_setg_win32(errp, WSAGetLastError(), "failed to
> WSAEventSelect()");
> + error_setg_win32(&error_warn, WSAGetLastError(),
> + "failed to WSAEventSelect()");
> return false;
> }
>
> @@ -315,7 +312,7 @@ bool qemu_socket_select(int sockfd, WSAEVENT hEventObject,
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
