Re: [PATCH] ui/spice: fix compilation on win32

[Marc-André Lureau]

Hi

On Wed, Mar 22, 2023 at 1:01 PM Philippe Mathieu-Daudé
<philmd@linaro.org> wrote:
>
> On 22/3/23 08:52, marcandre.lureau@redhat.com wrote:
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > qemu_close_to_socket() renaming left-over.
> >
> > Fixes:
> > https://gitlab.com/qemu-project/qemu/-/issues/1553
> >
> > Fixes: commit e40283d9a ("ui/spice: fix SOCKET handling regression")
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > ---
> >   ui/spice-core.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/ui/spice-core.c b/ui/spice-core.c
> > index 67cfd3ca9c..52a59386d7 100644
> > --- a/ui/spice-core.c
> > +++ b/ui/spice-core.c
> > @@ -149,7 +149,7 @@ 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);
> > +    qemu_close_socket_osfhandle(watch->fd);
> >   #endif
> >       g_free(watch);
> >   }
>
> Wondering why this hasn't been caught by CI, apparently we miss
> the spice package:
>
> -- >8 --
> diff --git a/.cirrus.yml b/.cirrus.yml
> @@ -41,6 +41,7 @@ windows_msys2_task:
>         mingw-w64-x86_64-curl
>         mingw-w64-x86_64-gnutls
>         mingw-w64-x86_64-libnfs
> +      mingw-w64-x86_64-spice
>       "
>       CHERE_INVOKING: 1
>     msys2_cache:
> ---

Can you send a patch? I will trigger CI to check it.


-- 
Marc-André Lureau