From patchwork Tue Jul 12 23:39:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 104440 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4C39FB6EE8 for ; Wed, 13 Jul 2011 09:43:52 +1000 (EST) Received: from localhost ([::1]:35681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QgmcG-0008Id-5O for incoming@patchwork.ozlabs.org; Tue, 12 Jul 2011 19:43:48 -0400 Received: from eggs.gnu.org ([140.186.70.92]:42041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QgmYo-0008Hv-GR for qemu-devel@nongnu.org; Tue, 12 Jul 2011 19:40:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QgmYn-00056K-0A for qemu-devel@nongnu.org; Tue, 12 Jul 2011 19:40:14 -0400 Received: from mout.perfora.net ([74.208.4.195]:49711) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QgmYm-00053T-6T for qemu-devel@nongnu.org; Tue, 12 Jul 2011 19:40:12 -0400 Received: from localhost.localdomain ([32.97.110.59]) by mrelay.perfora.net (node=mrus1) with ESMTP (Nemesis) id 0LnyLo-1R9DYT48Eq-00g5KG; Tue, 12 Jul 2011 19:40:04 -0400 From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 12 Jul 2011 18:39:27 -0500 Message-Id: <1310513984-1163-2-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1310513984-1163-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1310513984-1163-1-git-send-email-mdroth@linux.vnet.ibm.com> X-Provags-ID: V02:K0:AA9bvxON1T5+ZDHISDPgSMUQ+Kop93uWp4Jg03Vh5Yz m2Y5V6xrtOnG1bN2j4kR4KYeixfdxhC/7E67b5O+v4lQB8E5eA NU3GtVUZbxMoeU5Q2fLK1PpCPsFE+7e08nQ9MWBmdAR/ScM9lG GqztBB8YnmZUfGi6QbMvgkcM0TZN/m2SerE6+EKGyRNq+OPkRE 47JNtaj2fDbfEMKZNlMfMDvNZ/Ph9OzaqK7W4GBBVE= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.208.4.195 Cc: aliguori@linux.vnet.ibm.com, Jes.Sorensen@redhat.com, agl@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v6 01/18] Add hard build dependency on glib X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Anthony Liguori GLib is an extremely common library that has a portable thread implementation along with tons of other goodies. GLib and GObject have a fantastic amount of infrastructure we can leverage in QEMU including an object oriented programming infrastructure. Short term, it has a very nice thread pool implementation that we could leverage in something like virtio-9p. It also has a test harness implementation that this series will use. Signed-off-by: Anthony Liguori Signed-off-by: Michael Roth --- Makefile | 2 ++ Makefile.objs | 2 ++ Makefile.target | 1 + configure | 13 +++++++++++++ 4 files changed, 18 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index b3ffbe2..42ae4e5 100644 --- a/Makefile +++ b/Makefile @@ -106,6 +106,8 @@ audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS) QEMU_CFLAGS+=$(CURL_CFLAGS) +QEMU_CFLAGS+=$(GLIB_CFLAGS) + ui/cocoa.o: ui/cocoa.m ui/sdl.o audio/sdlaudio.o ui/sdl_zoom.o baum.o: QEMU_CFLAGS += $(SDL_CFLAGS) diff --git a/Makefile.objs b/Makefile.objs index cea15e4..493c988 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -376,3 +376,5 @@ vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) +vl.o: QEMU_CFLAGS+=$(GLIB_CFLAGS) + diff --git a/Makefile.target b/Makefile.target index a53a2ff..b8256ae 100644 --- a/Makefile.target +++ b/Makefile.target @@ -203,6 +203,7 @@ QEMU_CFLAGS += $(VNC_TLS_CFLAGS) QEMU_CFLAGS += $(VNC_SASL_CFLAGS) QEMU_CFLAGS += $(VNC_JPEG_CFLAGS) QEMU_CFLAGS += $(VNC_PNG_CFLAGS) +QEMU_CFLAGS += $(GLIB_CFLAGS) # xen backend driver support obj-i386-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o diff --git a/configure b/configure index 88159ac..63156a2 100755 --- a/configure +++ b/configure @@ -1803,6 +1803,18 @@ EOF fi ########################################## +# glib support probe +if $pkg_config --modversion gthread-2.0 gio-2.0 > /dev/null 2>&1 ; then + glib_cflags=`$pkg_config --cflags gthread-2.0 gio-2.0 2>/dev/null` + glib_libs=`$pkg_config --libs gthread-2.0 gio-2.0 2>/dev/null` + libs_softmmu="$glib_libs $libs_softmmu" + libs_tools="$glib_libs $libs_tools" +else + echo "glib-2.0 required to compile QEMU" + exit 1 +fi + +########################################## # pthread probe PTHREADLIBS_LIST="-lpthread -lpthreadGC2" @@ -2849,6 +2861,7 @@ if test "$bluez" = "yes" ; then echo "CONFIG_BLUEZ=y" >> $config_host_mak echo "BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak fi +echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak if test "$xen" = "yes" ; then echo "CONFIG_XEN=y" >> $config_host_mak echo "CONFIG_XEN_CTRL_INTERFACE_VERSION=$xen_ctrl_version" >> $config_host_mak