[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 1/6] util/qemu-sockets: Replace the call to close a socket wit
From: |
Bin Meng |
Subject: |
[PATCH v2 1/6] util/qemu-sockets: Replace the call to close a socket with closesocket() |
Date: |
Wed, 27 Jul 2022 21:27:57 +0800 |
From: Bin Meng <bin.meng@windriver.com>
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>
---
(no changes since v1)
util/qemu-sockets.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 13b5b197f9..0e2298278f 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -487,7 +487,7 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error
**errp)
if (ret < 0) {
error_setg_errno(errp, errno, "Unable to set KEEPALIVE");
- close(sock);
+ closesocket(sock);
return -1;
}
}
@@ -1050,7 +1050,7 @@ static int unix_connect_saddr(UnixSocketAddress *saddr,
Error **errp)
return sock;
err:
- close(sock);
+ closesocket(sock);
return -1;
}
--
2.34.1
- [PATCH v2 0/6] Enable unix socket support on Windows, Bin Meng, 2022/07/27
- [PATCH v2 1/6] util/qemu-sockets: Replace the call to close a socket with closesocket(),
Bin Meng <=
- [PATCH v2 2/6] util/oslib-win32: Add a helper to get the Windows version, Bin Meng, 2022/07/27
- [PATCH v2 3/6] qga/commands-win32: Use os_get_win_version(), Bin Meng, 2022/07/27
- [PATCH v2 4/6] util/qemu-sockets: Enable unix socket support on Windows, Bin Meng, 2022/07/27
- [PATCH v2 5/6] chardev/char-socket: Update AF_UNIX for Windows, Bin Meng, 2022/07/27
- [PATCH v2 6/6] tests/unit: Update test-io-channel-socket.c for Windows, Bin Meng, 2022/07/27