commit ff5927baa7ffb9c97873a071f6a8d85a3584182b
author Marc-André Lureau <marcandre.lureau@redhat.com> Mon Apr 25 17:33:47 2022 +0400
committer Marc-André Lureau <marcandre.lureau@redhat.com> Tue May 03 15:53:20 2022 +0400
tree fac232e795ec7f76ad8ca15a59a7d8b908e7a225
parent b2670d1f9976260191ebccecc822fea7114fd448

util: rename qemu_*block() socket functions

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 f9e8cacc5557e43 ("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>

chardev/char-socket.c

diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index fab2d79..dc4e218 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -311,7 +311,7 @@
         }
 
         /* O_NONBLOCK is preserved across SCM_RIGHTS so reset it */
-        qemu_set_block(fd);
+        qemu_socket_set_block(fd);
 
 #ifndef MSG_CMSG_CLOEXEC
         qemu_set_cloexec(fd);