From patchwork Sun Jun 12 20:46:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 100115 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 4303BB70A0 for ; Mon, 13 Jun 2011 07:06:19 +1000 (EST) Received: from localhost ([::1]:56260 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QVrrL-0006M0-TL for incoming@patchwork.ozlabs.org; Sun, 12 Jun 2011 17:06:16 -0400 Received: from eggs.gnu.org ([140.186.70.92]:57112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QVrYM-0003DU-FU for qemu-devel@nongnu.org; Sun, 12 Jun 2011 16:46:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QVrYK-0007fB-Np for qemu-devel@nongnu.org; Sun, 12 Jun 2011 16:46:38 -0400 Received: from mtagate5.uk.ibm.com ([194.196.100.165]:53773) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QVrYK-0007el-4j for qemu-devel@nongnu.org; Sun, 12 Jun 2011 16:46:36 -0400 Received: from d06nrmr1806.portsmouth.uk.ibm.com (d06nrmr1806.portsmouth.uk.ibm.com [9.149.39.193]) by mtagate5.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p5CKkXt2031143 for ; Sun, 12 Jun 2011 20:46:33 GMT Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p5CKkRDm2416756 for ; Sun, 12 Jun 2011 21:46:33 +0100 Received: from d06av03.portsmouth.uk.ibm.com (localhost.localdomain [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p5CKkRKr005106 for ; Sun, 12 Jun 2011 14:46:27 -0600 Received: from stefanha-thinkpad.ibm.com ([9.79.6.173]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p5CKkQ3b005094; Sun, 12 Jun 2011 14:46:27 -0600 From: Stefan Hajnoczi To: Date: Sun, 12 Jun 2011 21:46:21 +0100 Message-Id: <1307911585-22106-2-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.3 In-Reply-To: <1307911585-22106-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1307911585-22106-1-git-send-email-stefanha@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 194.196.100.165 Cc: Kevin Wolf , Anthony Liguori , Stefan Hajnoczi , Michael Roth , Blue Swirl , "Aneesh Kumar K.V" , Paolo Bonzini , Venkateswararao Jujjuri Subject: [Qemu-devel] [PATCH v5 1/5] 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 Signed-off-by: Stefan Hajnoczi --- Makefile | 2 ++ Makefile.objs | 2 ++ Makefile.target | 1 + configure | 13 +++++++++++++ 4 files changed, 18 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 096480b..306cd9b 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 52d8b23..a7807e8 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -368,3 +368,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 b1a0f6d..0d900e2 100644 --- a/Makefile.target +++ b/Makefile.target @@ -202,6 +202,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 663b557..3697eba 100755 --- a/configure +++ b/configure @@ -1767,6 +1767,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 + +########################################## # kvm probe if test "$kvm" != "no" ; then cat > $TMPC <> $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