motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

util: rename qemu_*block() socket functions

Browse source 
The qemu_*block() functions are meant to be be used with sockets (the
win32 implementation expects SOCKET)

Over time, those functions where used with Win32 SOCKET or
file-descriptors interchangeably. But for portability, they must only be
used with socket-like file-descriptors. FDs can use
g_unix_set_fd_nonblocking() instead.

Rename the functions with "socket" in the name to prevent bad usages.

This is effectively reverting commit f9e8cacc55 ("oslib-posix:
rename socket_set_nonblock() to qemu_set_nonblock()").

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-04-25 17:33:47 +04:00
parent b2670d1f99
commit ff5927baa7
14 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
util/oslib-win32.c
View file

@ -184,14 +184,14 @@ static int socket_error(void)
}
}
void qemu_set_block(int fd)
void qemu_socket_set_block(int fd)
{
unsigned long opt = 0;
WSAEventSelect(fd, NULL, 0);
ioctlsocket(fd, FIONBIO, &opt);
}
int qemu_try_set_nonblock(int fd)
int qemu_socket_try_set_nonblock(int fd)
{
unsigned long opt = 1;
if (ioctlsocket(fd, FIONBIO, &opt) != NO_ERROR) {
@ -200,9 +200,9 @@ int qemu_try_set_nonblock(int fd)
return 0;
}
void qemu_set_nonblock(int fd)
void qemu_socket_set_nonblock(int fd)
{
(void)qemu_try_set_nonblock(fd);
(void)qemu_socket_try_set_nonblock(fd);
}
int socket_set_fast_reuse(int fd)