Branch: refs/heads/staging Home: https://github.com/qemu/qemu Commit: 8278e30c459e21db93c17d2182ad8352ec2dd4f9 https://github.com/qemu/qemu/commit/8278e30c459e21db93c17d2182ad8352ec2dd4f9 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023)
Changed paths: M include/qemu/osdep.h M util/oslib-posix.c M util/oslib-win32.c Log Message: ----------- util: drop qemu_fork() Fortunately, qemu_fork() is no longer used since commit a95570e3e4d6 ("io/command: use glib GSpawn, instead of open-coding fork/exec"). (GSpawn uses posix_spawn() whenever possible instead) Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> Message-Id: <20230221124802.4103554-2-marcandre.lur...@redhat.com> Commit: a59100a9b0733149484d52af61db69f1bf4db60e https://github.com/qemu/qemu/commit/a59100a9b0733149484d52af61db69f1bf4db60e Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M tests/unit/socket-helpers.c Log Message: ----------- tests: use closesocket() Because they are actually sockets... Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Thomas Huth <th...@redhat.com> Message-Id: <20230221124802.4103554-3-marcandre.lur...@redhat.com> Commit: 651ccdfa8e31fb06c1f589126db42fa756055a7a https://github.com/qemu/qemu/commit/651ccdfa8e31fb06c1f589126db42fa756055a7a Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M io/channel-socket.c Log Message: ----------- io: use closesocket() Because they are actually sockets... Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Thomas Huth <th...@redhat.com> Message-Id: <20230221124802.4103554-4-marcandre.lur...@redhat.com> Commit: 6bbee5dbaae1bebf5e37d3d2083584673d439631 https://github.com/qemu/qemu/commit/6bbee5dbaae1bebf5e37d3d2083584673d439631 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M tests/unit/meson.build A tests/unit/test-error-report.c Log Message: ----------- tests: add test-error-report Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Stefan Berger <stef...@linux.ibm.com> Message-Id: <20230221124802.4103554-5-marcandre.lur...@redhat.com> Commit: 3ffef1a55ca3b55fa64d43cd35af5adb2c260463 https://github.com/qemu/qemu/commit/3ffef1a55ca3b55fa64d43cd35af5adb2c260463 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M include/qapi/error.h M tests/unit/test-error-report.c M util/error.c Log Message: ----------- error: add global &error_warn destination This can help debugging issues or develop, when error handling is introduced. Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Stefan Berger <stef...@linux.ibm.com> Message-Id: <20230221124802.4103554-6-marcandre.lur...@redhat.com> Commit: f5fd677ae7cf7cfb07b12adbfd479c460ddc3ac5 https://github.com/qemu/qemu/commit/f5fd677ae7cf7cfb07b12adbfd479c460ddc3ac5 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M include/sysemu/os-win32.h M io/channel-socket.c M io/channel-watch.c M util/aio-win32.c M util/main-loop.c M util/oslib-win32.c Log Message: ----------- win32/socket: introduce qemu_socket_select() helper This is a wrapper for WSAEventSelect, with Error handling. By default, it will produce a warning, so callers don't have to be modified now, and yet we can spot potential mis-use. Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Stefan Berger <stef...@linux.ibm.com> Message-Id: <20230221124802.4103554-7-marcandre.lur...@redhat.com> Commit: a4aafea26152b58c61c8105ffc574661cdfeb17b https://github.com/qemu/qemu/commit/a4aafea26152b58c61c8105ffc574661cdfeb17b Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M include/sysemu/os-win32.h M io/channel-socket.c M util/oslib-win32.c Log Message: ----------- win32/socket: introduce qemu_socket_unselect() helper A more explicit version of qemu_socket_select() with no events. Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Stefan Berger <stef...@linux.ibm.com> Message-Id: <20230221124802.4103554-8-marcandre.lur...@redhat.com> Commit: 6eeef4477a8588f44a15458ab560c68d373d1033 https://github.com/qemu/qemu/commit/6eeef4477a8588f44a15458ab560c68d373d1033 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M include/block/aio.h M util/aio-posix.c M util/aio-win32.c Log Message: ----------- aio: make aio_set_fd_poll() static to aio-posix.c Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Stefan Berger <stef...@linux.ibm.com> Message-Id: <20230221124802.4103554-9-marcandre.lur...@redhat.com> Commit: e2a3a2193ef2d252a1b3553e90895189a248bd22 https://github.com/qemu/qemu/commit/e2a3a2193ef2d252a1b3553e90895189a248bd22 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M util/aio-win32.c Log Message: ----------- aio/win32: aio_set_fd_handler() only supports SOCKET Let's check if the argument is actually a SOCKET, else report an error and return. Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Stefan Berger <stef...@linux.ibm.com> Message-Id: <20230221124802.4103554-10-marcandre.lur...@redhat.com> Commit: faa4ec16419c62d616fcc2dfc02d74d7fcc513d7 https://github.com/qemu/qemu/commit/faa4ec16419c62d616fcc2dfc02d74d7fcc513d7 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M include/qemu/main-loop.h M net/slirp.c M util/main-loop.c Log Message: ----------- main-loop: remove qemu_fd_register(), win32/slirp/socket specific Open-code the socket registration where it's needed, to avoid artificially used or unclear generic interface. Furthermore, the following patches are going to make socket handling use FD-only inside QEMU, but we need to handle win32 SOCKET from libslirp. Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Stefan Berger <stef...@linux.ibm.com> Message-Id: <20230221124802.4103554-12-marcandre.lur...@redhat.com> Commit: 21ac728498c1d529dd0abde1054703946be163da https://github.com/qemu/qemu/commit/21ac728498c1d529dd0abde1054703946be163da Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M net/slirp.c Log Message: ----------- slirp: unregister the win32 SOCKET Presumably, this is what should happen when the SOCKET is to be removed. (it probably worked until now because closesocket() does it implicitly, but we never now how the slirp library could use the SOCKET later) Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Stefan Berger <stef...@linux.ibm.com> Message-Id: <20230221124802.4103554-13-marcandre.lur...@redhat.com> Commit: fd3c3333157a8121e4ba9485677ef5860f8fb2db https://github.com/qemu/qemu/commit/fd3c3333157a8121e4ba9485677ef5860f8fb2db Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M net/slirp.c Log Message: ----------- slirp: open-code qemu_socket_(un)select() We are about to make the QEMU socket API use file-descriptor space only, but libslirp gives us SOCKET as fd, still. Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Stefan Berger <stef...@linux.ibm.com> Message-Id: <20230221124802.4103554-14-marcandre.lur...@redhat.com> Commit: abe34282b088499f4e86fff9bb6d6dafd57ae1d0 https://github.com/qemu/qemu/commit/abe34282b088499f4e86fff9bb6d6dafd57ae1d0 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M include/sysemu/os-win32.h M io/channel-watch.c M util/aio-win32.c M util/oslib-win32.c Log Message: ----------- win32: avoid mixing SOCKET and file descriptor space Until now, a win32 SOCKET handle is often cast to an int file descriptor, as this is what other OS use for sockets. When necessary, QEMU eventually queries whether it's a socket with the help of fd_is_socket(). However, there is no guarantee of conflict between the fd and SOCKET space. Such conflict would have surprising consequences, we shouldn't mix them. Also, it is often forgotten that SOCKET must be closed with closesocket(), and not close(). Instead, let's make the win32 socket wrapper functions return and take a file descriptor, and let util/ wrappers do the fd/SOCKET conversion as necessary. A bit of adaptation is necessary in io/ as well. Unfortunately, we can't drop closesocket() usage, despite _open_osfhandle() documentation claiming transfer of ownership, testing shows bad behaviour if you forget to call closesocket(). Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Stefan Berger <stef...@linux.ibm.com> Message-Id: <20230221124802.4103554-15-marcandre.lur...@redhat.com> Commit: b7e5374637daffa49657be2c559a0566836a172f https://github.com/qemu/qemu/commit/b7e5374637daffa49657be2c559a0566836a172f Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M include/sysemu/os-posix.h Log Message: ----------- os-posix: remove useless ioctlsocket() define The API is specific to win32. Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> Message-Id: <20230221124802.4103554-16-marcandre.lur...@redhat.com> Commit: 25657fc6c1b693096e2ceadaa53cd10c1e81c8d9 https://github.com/qemu/qemu/commit/25657fc6c1b693096e2ceadaa53cd10c1e81c8d9 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M backends/tpm/tpm_emulator.c M crypto/afalg.c M hw/hyperv/syndbg.c M include/sysemu/os-posix.h M include/sysemu/os-win32.h M io/channel-socket.c M net/dgram.c M net/socket.c M tests/qtest/libqtest.c M tests/qtest/microbit-test.c M tests/qtest/netdev-socket.c M tests/unit/socket-helpers.c M util/oslib-win32.c M util/qemu-sockets.c Log Message: ----------- win32: replace closesocket() with close() wrapper Use a close() wrapper instead, so that we don't need to worry about closesocket() vs close() anymore, let's hope. Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Stefan Berger <stef...@linux.ibm.com> Message-Id: <20230221124802.4103554-17-marcandre.lur...@redhat.com> Commit: 6d3b418a4e8d7e74b98ddf3862f8b04e1b198b51 https://github.com/qemu/qemu/commit/6d3b418a4e8d7e74b98ddf3862f8b04e1b198b51 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M tests/unit/test-io-channel-command.c Log Message: ----------- tests: fix path separator, use g_build_filename() Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Reviewed-by: Thomas Huth <th...@redhat.com> Message-Id: <20230306122751.2355515-2-marcandre.lur...@redhat.com> Commit: 8467936e3df3484b4931576a72ae760a1610f022 https://github.com/qemu/qemu/commit/8467936e3df3484b4931576a72ae760a1610f022 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M chardev/char.c Log Message: ----------- char: do not double-close fd when failing to add client The caller is already closing the fd on failure. Fixes: c3054a6e6a ("char: Factor out qmp_add_client() parts and move to chardev/") Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Reviewed-by: Thomas Huth <th...@redhat.com> Message-Id: <20230306122751.2355515-3-marcandre.lur...@redhat.com> Commit: e387ef472f661657df67574e337f0558424f836a https://github.com/qemu/qemu/commit/e387ef472f661657df67574e337f0558424f836a Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M tests/docker/docker.py Log Message: ----------- tests/docker: fix a win32 error due to portability docker.py is run during configure, and produces an error: No module named 'pwd'. Use a more portable and recommended alternative to lookup the user "login name". Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Message-Id: <20230306122751.2355515-4-marcandre.lur...@redhat.com> Commit: 0a237f4de45b8addbc35a316ee1c0bc7a4887da7 https://github.com/qemu/qemu/commit/0a237f4de45b8addbc35a316ee1c0bc7a4887da7 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M include/qemu/sockets.h M util/oslib-win32.c Log Message: ----------- osdep: implement qemu_socketpair() for win32 Manually implement a socketpair() function, using UNIX sockets and simple peer credential checking. QEMU doesn't make much use of socketpair, beside vhost-user which is not available for win32 at this point. However, I intend to use it for writing some new portable tests. Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> Message-Id: <20230306122751.2355515-5-marcandre.lur...@redhat.com> Commit: bf5de8c5d66552721fefe08de849c115ca366b56 https://github.com/qemu/qemu/commit/bf5de8c5d66552721fefe08de849c115ca366b56 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M monitor/qmp-cmds.c M qapi/misc.json Log Message: ----------- qmp: 'add_client' actually expects sockets Whether it is SPICE, VNC, D-Bus, or the socket chardev, they all actually expect a socket kind or will fail in different ways at runtime. Throw an error early if the given 'add_client' fd is not a socket, and close it to avoid leaks. This allows to replace the close() call with a more correct & portable closesocket() version. (this will allow importing sockets on Windows with a specialized command in the following patch, while keeping the remaining monitor associated sockets/add_client code & usage untouched) Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Acked-by: Markus Armbruster <arm...@redhat.com> Message-Id: <20230306122751.2355515-6-marcandre.lur...@redhat.com> Commit: 78ae0e2613831909f1e553d45fae7925ade6c7f7 https://github.com/qemu/qemu/commit/78ae0e2613831909f1e553d45fae7925ade6c7f7 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M monitor/fds.c Log Message: ----------- monitor: release the lock before calling close() As per comment, presumably to avoid syscall in critical section. Fixes: 0210c3b39bef08 ("monitor: Use LOCK_GUARD macros") Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Message-Id: <20230306122751.2355515-7-marcandre.lur...@redhat.com> Commit: 4cda177c6016565dda1f1c3f6cff8ab85ef0d016 https://github.com/qemu/qemu/commit/4cda177c6016565dda1f1c3f6cff8ab85ef0d016 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M monitor/fds.c M qapi/misc.json Log Message: ----------- qmp: add 'get-win32-socket' A process with enough capabilities can duplicate a socket to QEMU. Add a QMP command to import it and add it to the monitor fd list, so it can be later used by other commands. Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Acked-by: Markus Armbruster <arm...@redhat.com> Message-Id: <20230306122751.2355515-9-marcandre.lur...@redhat.com> Commit: 61683d278be8614ba4d5e9cc21226ac50f4f46d0 https://github.com/qemu/qemu/commit/61683d278be8614ba4d5e9cc21226ac50f4f46d0 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M tests/qtest/libqtest.c M tests/qtest/libqtest.h Log Message: ----------- libqtest: make qtest_qmp_add_client work on win32 Use the "get-win32-socket" function to pass an opened socket to QEMU, instead of using "getfd", which relies on socket ancillary FD message passing. Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> Message-Id: <20230306122751.2355515-10-marcandre.lur...@redhat.com> Commit: f02b2c19174e3b5e0823e55cfb50d1b3153a485e https://github.com/qemu/qemu/commit/f02b2c19174e3b5e0823e55cfb50d1b3153a485e Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M tests/qtest/vnc-display-test.c Log Message: ----------- qtest: enable vnc-display test on win32 Now that qtest_qmp_add_client() works on win32, we can enable the VNC test. Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Acked-by: Thomas Huth <th...@redhat.com> Message-Id: <20230306122751.2355515-11-marcandre.lur...@redhat.com> Commit: 4bf21c7f748bee42b6f4692f8c37a11d1033b2d1 https://github.com/qemu/qemu/commit/4bf21c7f748bee42b6f4692f8c37a11d1033b2d1 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M hmp-commands.hx M monitor/fds.c M monitor/hmp-cmds.c M qapi/misc.json Log Message: ----------- monitor: restrict command getfd to POSIX hosts Currently, the function will simply fail if ancillary fds are not provided, for ex on unsupported platforms. This changes the failure from: {"error": {"class": "GenericError", "desc": "No file descriptor supplied via SCM_RIGHTS"}} to: {"error": {"class": "CommandNotFound", "desc": "The command getfd has not been found"}} Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Markus Armbruster <arm...@redhat.com> Commit: 284c52eec2d0a1b9c47f06c3eee46762c5fc0915 https://github.com/qemu/qemu/commit/284c52eec2d0a1b9c47f06c3eee46762c5fc0915 Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2023-03-13 (Mon, 13 Mar 2023) Changed paths: M backends/tpm/tpm_emulator.c M chardev/char.c M crypto/afalg.c M hmp-commands.hx M hw/hyperv/syndbg.c M include/block/aio.h M include/qapi/error.h M include/qemu/main-loop.h M include/qemu/osdep.h M include/qemu/sockets.h M include/sysemu/os-posix.h M include/sysemu/os-win32.h M io/channel-socket.c M io/channel-watch.c M monitor/fds.c M monitor/hmp-cmds.c M monitor/qmp-cmds.c M net/dgram.c M net/slirp.c M net/socket.c M qapi/misc.json M tests/docker/docker.py M tests/qtest/libqtest.c M tests/qtest/libqtest.h M tests/qtest/microbit-test.c M tests/qtest/netdev-socket.c M tests/qtest/vnc-display-test.c M tests/unit/meson.build M tests/unit/socket-helpers.c A tests/unit/test-error-report.c M tests/unit/test-io-channel-command.c M util/aio-posix.c M util/aio-win32.c M util/error.c M util/main-loop.c M util/oslib-posix.c M util/oslib-win32.c M util/qemu-sockets.c Log Message: ----------- Merge tag 'win-socket-pull-request' of https://gitlab.com/marcandre.lureau/qemu into staging QMP command to import win32 sockets # -----BEGIN PGP SIGNATURE----- # # iQJQBAABCAA6FiEEh6m9kz+HxgbSdvYt2ujhCXWWnOUFAmQPDQ0cHG1hcmNhbmRy # ZS5sdXJlYXVAcmVkaGF0LmNvbQAKCRDa6OEJdZac5eTUD/41+bodkctP9wtNQT5g # 4P2XQysa9dhxIaQuPT48J5bN0velOAv+p+e9jNMojVPHogACRGkjJUGrh2AhaWJO # bpqB5teNz3pbTLAHNrqiJdUrJDI0WSqBN2q7WgfbzvHMugBqul13n6UG/cVWH8D3 # pDX3miBl9Cv3zUDFzPjHH3eR/MHz+6wXmuzUGQdWqyGBoLwqgWA3Bqh39BDVOeJf # 03Kq3TbJSP096EjGGrq1pTYDIIv9AKzUWgn8tT8S73sD3J0BN28Gl5HirXDx8e/4 # 2WtW/XLYKjqoUl7RmXOjfOarCV+kxzdoYCAUYfyH6DLWrkXc41L5ugFdyxxQ66Sh # +on7hKCBzPEOPEXmlm6HlMj3bK4C/GI6mIoaZgCrsvj9xlehhQNtwpndAwAR8esH # perQ6q+jPdoQnBvOBgC3amckS1kYdbQivTILkoopumw/q4waG5reyA4rshbhm/bs # U33ZRzob0XyRWqvWAcq9hnWB5gvQCcppeJlu60gocnX5wdZOjbnsBXw3l+r2osIh # izJbxwM6xmz9oHh50nhDCn42JrNdSnZJdJ/XA/lrOkTHQ6kbZO7v86Y/mKQz+Vyx # Uyhb8/y8gKrUkZlGCEMvQVcyvOA8vneX8WhfZUm6w5MWWCNKfCrEl6UGmFkPAL0m # +sUYIhN5PSxWSQU5MWogXtQEPA== # =/Y/7 # -----END PGP SIGNATURE----- # gpg: Signature made Mon 13 Mar 2023 11:46:21 GMT # gpg: using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5 # gpg: issuer "marcandre.lur...@redhat.com" # gpg: Good signature from "Marc-André Lureau <marcandre.lur...@redhat.com>" [full] # gpg: aka "Marc-André Lureau <marcandre.lur...@gmail.com>" [full] # Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5 * tag 'win-socket-pull-request' of https://gitlab.com/marcandre.lureau/qemu: (25 commits) monitor: restrict command getfd to POSIX hosts qtest: enable vnc-display test on win32 libqtest: make qtest_qmp_add_client work on win32 qmp: add 'get-win32-socket' monitor: release the lock before calling close() qmp: 'add_client' actually expects sockets osdep: implement qemu_socketpair() for win32 tests/docker: fix a win32 error due to portability char: do not double-close fd when failing to add client tests: fix path separator, use g_build_filename() win32: replace closesocket() with close() wrapper os-posix: remove useless ioctlsocket() define win32: avoid mixing SOCKET and file descriptor space slirp: open-code qemu_socket_(un)select() slirp: unregister the win32 SOCKET main-loop: remove qemu_fd_register(), win32/slirp/socket specific aio/win32: aio_set_fd_handler() only supports SOCKET aio: make aio_set_fd_poll() static to aio-posix.c win32/socket: introduce qemu_socket_unselect() helper win32/socket: introduce qemu_socket_select() helper ... Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Compare: https://github.com/qemu/qemu/compare/a515336a2cef...284c52eec2d0