[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/7] ui/spice: fix SOCKET handling regression
From: |
marcandre . lureau |
Subject: |
[PULL 2/7] ui/spice: fix SOCKET handling regression |
Date: |
Tue, 21 Mar 2023 13:03:29 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Spice uses SOCKET on win32, but QEMU now uses file-descriptors.
Fixes "8.0.0rc0 Regression: spicy windows doesn't open":
https://gitlab.com/qemu-project/qemu/-/issues/1549
Fixes: commit abe34282b ("win32: avoid mixing SOCKET and file descriptor space")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230320133643.1618437-3-marcandre.lureau@redhat.com>
---
ui/spice-core.c | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/ui/spice-core.c b/ui/spice-core.c
index b05c830086..67cfd3ca9c 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -90,13 +90,23 @@ struct SpiceWatch {
static void watch_read(void *opaque)
{
SpiceWatch *watch = opaque;
- watch->func(watch->fd, SPICE_WATCH_EVENT_READ, watch->opaque);
+ int fd = watch->fd;
+
+#ifdef WIN32
+ fd = _get_osfhandle(fd);
+#endif
+ watch->func(fd, SPICE_WATCH_EVENT_READ, watch->opaque);
}
static void watch_write(void *opaque)
{
SpiceWatch *watch = opaque;
- watch->func(watch->fd, SPICE_WATCH_EVENT_WRITE, watch->opaque);
+ int fd = watch->fd;
+
+#ifdef WIN32
+ fd = _get_osfhandle(fd);
+#endif
+ watch->func(fd, SPICE_WATCH_EVENT_WRITE, watch->opaque);
}
static void watch_update_mask(SpiceWatch *watch, int event_mask)
@@ -117,6 +127,14 @@ static SpiceWatch *watch_add(int fd, int event_mask,
SpiceWatchFunc func, void *
{
SpiceWatch *watch;
+#ifdef WIN32
+ fd = _open_osfhandle(fd, _O_BINARY);
+ if (fd < 0) {
+ error_setg_win32(&error_warn, WSAGetLastError(), "Couldn't associate a
FD with the SOCKET");
+ return NULL;
+ }
+#endif
+
watch = g_malloc0(sizeof(*watch));
watch->fd = fd;
watch->func = func;
@@ -129,6 +147,10 @@ static SpiceWatch *watch_add(int fd, int event_mask,
SpiceWatchFunc func, void *
static void watch_remove(SpiceWatch *watch)
{
qemu_set_fd_handler(watch->fd, NULL, NULL, NULL);
+#ifdef WIN32
+ /* SOCKET is owned by spice */
+ qemu_close_to_socket(watch->fd);
+#endif
g_free(watch);
}
@@ -908,6 +930,9 @@ static int qemu_spice_set_pw_expire(time_t expires)
static int qemu_spice_display_add_client(int csock, int skipauth, int tls)
{
+#ifdef WIN32
+ csock = qemu_close_socket_osfhandle(csock);
+#endif
if (tls) {
return spice_server_add_ssl_client(spice_server, csock, skipauth);
} else {
--
2.39.2
- [PULL 0/7] ui/ fixes for 8.0, marcandre . lureau, 2023/03/21
- [PULL 1/7] win32: add qemu_close_socket_osfhandle(), marcandre . lureau, 2023/03/21
- [PULL 2/7] ui/spice: fix SOCKET handling regression,
marcandre . lureau <=
- [PULL 3/7] ui/dbus: fix passing SOCKET to GSocket API & leak, marcandre . lureau, 2023/03/21
- [PULL 4/7] ui/gtk: fix cursor moved to left corner, marcandre . lureau, 2023/03/21
- [PULL 5/7] ui: return the default console cursor when con == NULL, marcandre . lureau, 2023/03/21
- [PULL 6/7] ui/sdl2: remove workaround forcing x11, marcandre . lureau, 2023/03/21
- [PULL 7/7] ui: fix crash on serial reset, during init, marcandre . lureau, 2023/03/21
- Re: [PULL 0/7] ui/ fixes for 8.0, Erico Nunes, 2023/03/21
- Re: [PULL 0/7] ui/ fixes for 8.0, Peter Maydell, 2023/03/21