[Qemu-devel] [PATCH] win32: use glib gpoll if glib >= 2.50

[Qemu-devel] [PATCH] win32: use glib gpoll if glib >= 2.50

[Marc-André Lureau]

A fix has been committed in upstream glib commit
210a9796f78eb90f76f1bd6a304e9fea05e97617.
(See also related bug https://bugzilla.gnome.org/show_bug.cgi?id=764415)

It is desirable to use the glib version instead of qemu copy, since it
provides more debugging facilities (G_MAIN_POLL_DEBUG etc), and
hopefully has a better maintainance. Hopefully, we can drop the qemu
copy in a few years.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 include/glib-compat.h | 2 +-
 util/oslib-win32.c    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/glib-compat.h b/include/glib-compat.h
index acf254d2a0..0cd24ffbe9 100644
--- a/include/glib-compat.h
+++ b/include/glib-compat.h
@@ -39,7 +39,7 @@ static inline gint64 qemu_g_get_monotonic_time(void)
 #define g_get_monotonic_time() qemu_g_get_monotonic_time()
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !GLIB_CHECK_VERSION(2, 50, 0)
 /*
  * g_poll has a problem on Windows when using
  * timeouts < 10ms, so use wrapper.
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index d09863cc9d..0b1890fd33 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -327,6 +327,7 @@ char *qemu_get_exec_dir(void)
     return g_strdup(exec_dir);
 }
 
+#if !GLIB_CHECK_VERSION(2, 50, 0)
 /*
  * The original implementation of g_poll from glib has a problem on Windows
  * when using timeouts < 10 ms.
@@ -530,6 +531,7 @@ gint g_poll(GPollFD *fds, guint nfds, gint timeout)
 
     return retval;
 }
+#endif
 
 int getpagesize(void)
 {
-- 
2.11.0

Re: [Qemu-devel] [PATCH] win32: use glib gpoll if glib >= 2.50

[Stefan Weil]

On 01/03/17 20:19, Marc-André Lureau wrote:
> A fix has been committed in upstream glib commit
> 210a9796f78eb90f76f1bd6a304e9fea05e97617.
> (See also related bug https://bugzilla.gnome.org/show_bug.cgi?id=764415)
>
> It is desirable to use the glib version instead of qemu copy, since it
> provides more debugging facilities (G_MAIN_POLL_DEBUG etc), and
> hopefully has a better maintainance. Hopefully, we can drop the qemu
> copy in a few years.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  include/glib-compat.h | 2 +-
>  util/oslib-win32.c    | 2 ++
>  2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/include/glib-compat.h b/include/glib-compat.h
> index acf254d2a0..0cd24ffbe9 100644
> --- a/include/glib-compat.h
> +++ b/include/glib-compat.h
> @@ -39,7 +39,7 @@ static inline gint64 qemu_g_get_monotonic_time(void)
>  #define g_get_monotonic_time() qemu_g_get_monotonic_time()
>  #endif
>
> -#ifdef _WIN32
> +#if defined(_WIN32) && !GLIB_CHECK_VERSION(2, 50, 0)
>  /*
>   * g_poll has a problem on Windows when using
>   * timeouts < 10ms, so use wrapper.
> diff --git a/util/oslib-win32.c b/util/oslib-win32.c
> index d09863cc9d..0b1890fd33 100644
> --- a/util/oslib-win32.c
> +++ b/util/oslib-win32.c
> @@ -327,6 +327,7 @@ char *qemu_get_exec_dir(void)
>      return g_strdup(exec_dir);
>  }
>
> +#if !GLIB_CHECK_VERSION(2, 50, 0)
>  /*
>   * The original implementation of g_poll from glib has a problem on Windows
>   * when using timeouts < 10 ms.
> @@ -530,6 +531,7 @@ gint g_poll(GPollFD *fds, guint nfds, gint timeout)
>
>      return retval;
>  }
> +#endif
>
>  int getpagesize(void)
>  {
>

Thanks for this patch.
I think it can be applied via qemu-trivial (cc'ed).

Reviewed-by: Stefan Weil <sw@weilnetz.de>

Re: [Qemu-devel] [PATCH] win32: use glib gpoll if glib >= 2.50

[Daniel P. Berrange]

On Tue, Jan 03, 2017 at 08:19:33PM +0100, Marc-André Lureau wrote:
> A fix has been committed in upstream glib commit
> 210a9796f78eb90f76f1bd6a304e9fea05e97617.
> (See also related bug https://bugzilla.gnome.org/show_bug.cgi?id=764415)

The bug is a little misleading because the comments indicate that
patch was going to be merged to master after 2.50 branched. The
git commit hash though shows it merged before branching

$ git describe 210a9796f78eb90f76f1bd6a304e9fea05e97617
2.48.0-41-g210a979

so the >= 2.50 check is good.

> It is desirable to use the glib version instead of qemu copy, since it
> provides more debugging facilities (G_MAIN_POLL_DEBUG etc), and
> hopefully has a better maintainance. Hopefully, we can drop the qemu
> copy in a few years.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  include/glib-compat.h | 2 +-
>  util/oslib-win32.c    | 2 ++
>  2 files changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>


Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://entangle-photo.org       -o-    http://search.cpan.org/~danberr/ :|

Re: [Qemu-devel] [PATCH] win32: use glib gpoll if glib >= 2.50

[Michael Tokarev]

03.01.2017 22:19, Marc-André Lureau wrote:
> A fix has been committed in upstream glib commit
> 210a9796f78eb90f76f1bd6a304e9fea05e97617.
> (See also related bug https://bugzilla.gnome.org/show_bug.cgi?id=764415)
> 
> It is desirable to use the glib version instead of qemu copy, since it
> provides more debugging facilities (G_MAIN_POLL_DEBUG etc), and
> hopefully has a better maintainance. Hopefully, we can drop the qemu
> copy in a few years.

Applied to -trivial, thank you!

/mjt