[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/6] util/qemu-sockets: Replace the call to close a socket with cl
From: |
Daniel P . Berrangé |
Subject: |
[PULL 6/6] util/qemu-sockets: Replace the call to close a socket with closesocket() |
Date: |
Fri, 5 Aug 2022 16:20:14 +0100 |
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>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
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.37.1
- [PULL 0/6] Misc next patches, Daniel P . Berrangé, 2022/08/05
- [PULL 1/6] docs: build-platforms: Clarify stance on minor releases and backports, Daniel P . Berrangé, 2022/08/05
- [PULL 2/6] QIOChannelSocket: Add support for MSG_ZEROCOPY + IPV6, Daniel P . Berrangé, 2022/08/05
- [PULL 3/6] target/i386: display deprecation status in '-cpu help', Daniel P . Berrangé, 2022/08/05
- [PULL 4/6] target/s390x: display deprecation status in '-cpu help', Daniel P . Berrangé, 2022/08/05
- [PULL 5/6] target/arm: display deprecation status in '-cpu help', Daniel P . Berrangé, 2022/08/05
- [PULL 6/6] util/qemu-sockets: Replace the call to close a socket with closesocket(),
Daniel P . Berrangé <=