From: Bin Meng <bmeng.cn@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Bin Meng" <bin.meng@windriver.com>,
"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PATCH 1/5] util/qemu-sockets: Replace the call to close a socket with closesocket()
Date: Wed, 27 Jul 2022 15:35:38 +0800 [thread overview]
Message-ID: <20220727073542.811420-2-bmeng.cn@gmail.com> (raw)
In-Reply-To: <20220727073542.811420-1-bmeng.cn@gmail.com>
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>
---
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
next prev parent reply other threads:[~2022-07-27 7:39 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-27 7:35 [PATCH 0/5] Enable unix socket support on Windows Bin Meng
2022-07-27 7:35 ` Bin Meng [this message]
2022-07-27 7:35 ` [PATCH 2/5] util/oslib-win32: Add a helper to get the Windows version Bin Meng
2022-07-27 8:50 ` Yan Vugenfirer
2022-07-27 9:38 ` Bin Meng
2022-07-27 9:59 ` Daniel P. Berrangé
2022-07-27 10:57 ` Yan Vugenfirer
2022-07-27 11:55 ` Bin Meng
2022-07-27 12:53 ` Daniel P. Berrangé
2022-07-27 13:15 ` Bin Meng
2022-07-27 13:18 ` Konstantin Kostiuk
2022-07-27 13:21 ` Bin Meng
2022-07-27 7:35 ` [PATCH 3/5] qga/commands-win32: Use os_get_win_version() Bin Meng
2022-07-27 8:59 ` Konstantin Kostiuk
2022-07-27 7:35 ` [PATCH 4/5] util/qemu-sockets: Enable unix socket support on Windows Bin Meng
2022-07-27 8:50 ` Yan Vugenfirer
2022-07-27 9:58 ` Bin Meng
2022-07-27 8:53 ` Konstantin Kostiuk
2022-07-27 10:01 ` Bin Meng
2022-07-28 13:11 ` Marc-André Lureau
2022-07-28 13:41 ` Bin Meng
2022-07-27 7:35 ` [PATCH 5/5] chardev/char-socket: Update AF_UNIX for Windows Bin Meng
2022-07-27 9:06 ` [PATCH 0/5] Enable unix socket support on Windows Daniel P. Berrangé
2022-07-27 10:15 ` Bin Meng
2022-07-27 10:24 ` Daniel P. Berrangé
2022-07-27 11:37 ` Bin Meng
2022-07-27 11:45 ` Stefan Weil via
2022-07-27 12:17 ` Bin Meng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220727073542.811420-2-bmeng.cn@gmail.com \
--to=bmeng.cn@gmail.com \
--cc=berrange@redhat.com \
--cc=bin.meng@windriver.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).