[Qemu-devel] [PATCH 1/3] glib: move g_poll() replacement into glib-compat.h

[Qemu-devel] [PATCH 1/3] glib: move g_poll() replacement into glib-compat.h

[Stefan Hajnoczi]

We have a dedicated header file for wrappers to smooth over glib version
differences.  Move the g_poll() definition into glib-compat.h for
consistency.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/glib-compat.h | 12 ++++++++++++
 include/qemu-common.h | 12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/glib-compat.h b/include/glib-compat.h
index 8aa77af..8d25900 100644
--- a/include/glib-compat.h
+++ b/include/glib-compat.h
@@ -24,4 +24,16 @@ static inline guint g_timeout_add_seconds(guint interval, GSourceFunc function,
 }
 #endif
 
+#if !GLIB_CHECK_VERSION(2, 20, 0)
+/*
+ * Glib before 2.20.0 doesn't implement g_poll, so wrap it to compile properly
+ * on older systems.
+ */
+static inline gint g_poll(GPollFD *fds, guint nfds, gint timeout)
+{
+    GMainContext *ctx = g_main_context_default();
+    return g_main_context_get_poll_func(ctx)(fds, nfds, timeout);
+}
+#endif
+
 #endif
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 5054836..e0e03cc 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -124,18 +124,6 @@ int qemu_main(int argc, char **argv, char **envp);
 void qemu_get_timedate(struct tm *tm, int offset);
 int qemu_timedate_diff(struct tm *tm);
 
-#if !GLIB_CHECK_VERSION(2, 20, 0)
-/*
- * Glib before 2.20.0 doesn't implement g_poll, so wrap it to compile properly
- * on older systems.
- */
-static inline gint g_poll(GPollFD *fds, guint nfds, gint timeout)
-{
-    GMainContext *ctx = g_main_context_default();
-    return g_main_context_get_poll_func(ctx)(fds, nfds, timeout);
-}
-#endif
-
 /**
  * is_help_option:
  * @s: string to test
-- 
1.8.5.3

[Qemu-devel] [PATCH 1/3] glib: move g_poll() replacement into glib-compat.h

[Michael Tokarev]

Stefan Hajnoczi:
> We have a dedicated header file for wrappers to smooth over glib version
> differences.  Move the g_poll() definition into glib-compat.h for
> consistency.

Ack.

Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>

I wanted to include exactly this in my series too, but forgot.

/mjt

Re: [Qemu-devel] [PATCH 1/3] glib: move g_poll() replacement into glib-compat.h

[Michael Tokarev]

02.05.2014 14:32, Michael Tokarev wrote:
> Stefan Hajnoczi:
>> We have a dedicated header file for wrappers to smooth over glib version
>> differences.  Move the g_poll() definition into glib-compat.h for
>> consistency.
> 
> Ack.
> 
> Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
> 
> I wanted to include exactly this in my series too, but forgot.

Forgot to mention: this can go to -trivial just fine.
Together with, I think, https://lists.gnu.org/archive/html/qemu-devel/2014-04/msg04546.html .

Thanks,

/mjt