mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/qemu-sockets: Replace the call to close a socket with closesocket()

Browse Source 
close() is a *nix function. It works on any file descriptor, and
sockets in *nix are an example of a file descriptor.

closesocket() is a Windows-specific function, which works only
specifically with sockets. Sockets on Windows do not use *nix-style
file descriptors, and socket() returns a handle to a kernel object
instead, so it must be closed with closesocket().

In QEMU there is already a logic to handle such platform difference
in os-posix.h and os-win32.h, that:

  * closesocket maps to close on POSIX
  * closesocket maps to a wrapper that calls the real closesocket()
    on Windows

Replace the call to close a socket with closesocket() instead.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Bin Meng 2022-08-02 15:51:57 +08:00 committed by Daniel P. Berrangé
parent 977c33ba5d
commit e3fdb13e88
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/qemu-sockets.c
View File

@ -487,7 +487,7 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error **errp)
if (ret < 0) { if (ret < 0) {
error_setg_errno(errp, errno, "Unable to set KEEPALIVE"); error_setg_errno(errp, errno, "Unable to set KEEPALIVE");
close(sock); closesocket(sock);
return -1; return -1;
} }
} }
@ -1050,7 +1050,7 @@ static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp)
return sock; return sock;
err: err:
close(sock); closesocket(sock);
return -1; return -1;
} }