From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:56945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rd7zf-0007Oi-Fx for qemu-devel@nongnu.org; Tue, 20 Dec 2011 17:17:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rd7zd-0000XN-LK for qemu-devel@nongnu.org; Tue, 20 Dec 2011 17:17:07 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:50480) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rd7zd-0000X7-G2 for qemu-devel@nongnu.org; Tue, 20 Dec 2011 17:17:05 -0500 Received: by iagj37 with SMTP id j37so12236413iag.4 for ; Tue, 20 Dec 2011 14:17:05 -0800 (PST) Message-ID: <4EF1095D.1070508@codemonkey.ws> Date: Tue, 20 Dec 2011 16:17:01 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <1324381264-5959-1-git-send-email-alevy@redhat.com> In-Reply-To: <1324381264-5959-1-git-send-email-alevy@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] g_thread_init users: don't call it if glib >= 2.31 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alon Levy Cc: qemu-devel@nongnu.org On 12/20/2011 05:41 AM, Alon Levy wrote: > since commit f9b29ca03 included in release 2.31 (docs below say 2.32 but > that is not correct) and onwards g_thread_init is deprecated and calling > it is not required: > > http://developer.gnome.org/glib/unstable/glib-Deprecated-Thread-APIs.html#g-thread-init > > g_thread_init has been deprecated since version 2.32 and should not be > used in newly-written code. This function is no longer necessary. The > GLib threading system is automatically initialized at the start of your > program. > > Fixes bulid failure when warnings are treated as errors on fedora 17. > > I only tested the change to vl.c, and copy pasted to the two other > locations (couldn't decide if a wrapper for calling g_thread_init is > uglier). > > Signed-off-by: Alon Levy Applied. Thanks. Regards, Anthony Liguori > --- > coroutine-gthread.c | 5 +++++ > trace/simple.c | 5 +++++ > vl.c | 5 +++++ > 3 files changed, 15 insertions(+), 0 deletions(-) > > diff --git a/coroutine-gthread.c b/coroutine-gthread.c > index fdea27a..662801b 100644 > --- a/coroutine-gthread.c > +++ b/coroutine-gthread.c > @@ -36,7 +36,12 @@ static GStaticPrivate coroutine_key = G_STATIC_PRIVATE_INIT; > static void __attribute__((constructor)) coroutine_init(void) > { > if (!g_thread_supported()) { > +#if !GLIB_CHECK_VERSION(2, 31, 0) > g_thread_init(NULL); > +#else > + fprintf(stderr, "glib threading failed to initialize.\n"); > + exit(1); > +#endif > } > > coroutine_cond = g_cond_new(); > diff --git a/trace/simple.c b/trace/simple.c > index 6339152..bbc9930 100644 > --- a/trace/simple.c > +++ b/trace/simple.c > @@ -376,7 +376,12 @@ bool trace_backend_init(const char *events, const char *file) > GThread *thread; > > if (!g_thread_supported()) { > +#if !GLIB_CHECK_VERSION(2, 31, 0) > g_thread_init(NULL); > +#else > + fprintf(stderr, "glib threading failed to initialize.\n"); > + exit(1); > +#endif > } > > trace_available_cond = g_cond_new(); > diff --git a/vl.c b/vl.c > index da69f94..06c9c94 100644 > --- a/vl.c > +++ b/vl.c > @@ -2176,7 +2176,12 @@ int main(int argc, char **argv, char **envp) > > g_mem_set_vtable(&mem_trace); > if (!g_thread_supported()) { > +#if !GLIB_CHECK_VERSION(2, 31, 0) > g_thread_init(NULL); > +#else > + fprintf(stderr, "glib threading failed to initialize.\n"); > + exit(1); > +#endif > } > > runstate_init();