SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests/qtest: libqtest: 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>
Message-Id: <20220925113032.1949844-46-bmeng.cn@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Bin Meng 2022-09-25 19:30:23 +08:00 committed by Thomas Huth
parent e6f59e4c0b
commit 3665fadd46
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/qtest/libqtest.c
View File

@ -97,7 +97,7 @@ static int socket_accept(int sock)
(void *)&timeout, sizeof(timeout))) { (void *)&timeout, sizeof(timeout))) {
fprintf(stderr, "%s failed to set SO_RCVTIMEO: %s\n", fprintf(stderr, "%s failed to set SO_RCVTIMEO: %s\n",
__func__, strerror(errno)); __func__, strerror(errno));
close(sock); closesocket(sock);
return -1; return -1;
} }
@ -108,7 +108,7 @@ static int socket_accept(int sock)
if (ret == -1) { if (ret == -1) {
fprintf(stderr, "%s failed: %s\n", __func__, strerror(errno)); fprintf(stderr, "%s failed: %s\n", __func__, strerror(errno));
} }
close(sock); closesocket(sock);
return ret; return ret;
} }
@ -421,8 +421,8 @@ void qtest_quit(QTestState *s)
qtest_remove_abrt_handler(s); qtest_remove_abrt_handler(s);
qtest_kill_qemu(s); qtest_kill_qemu(s);
close(s->fd); closesocket(s->fd);
close(s->qmp_fd); closesocket(s->qmp_fd);
g_string_free(s->rx, true); g_string_free(s->rx, true);
for (GList *it = s->pending_events; it != NULL; it = it->next) { for (GList *it = s->pending_events; it != NULL; it = it->next) {