From patchwork Mon Jun 27 09:21:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 102127 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 AB87CB6F70 for ; Mon, 27 Jun 2011 19:55:51 +1000 (EST) Received: from localhost ([::1]:53496 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qb8Xj-0003BP-08 for incoming@patchwork.ozlabs.org; Mon, 27 Jun 2011 05:55:47 -0400 Received: from eggs.gnu.org ([140.186.70.92]:33785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qb81g-0004L6-IO for qemu-devel@nongnu.org; Mon, 27 Jun 2011 05:22:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qb81e-00031B-8U for qemu-devel@nongnu.org; Mon, 27 Jun 2011 05:22:40 -0400 Received: from mail-fx0-f47.google.com ([209.85.161.47]:35689) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qb81d-0002vO-SU for qemu-devel@nongnu.org; Mon, 27 Jun 2011 05:22:38 -0400 Received: by mail-fx0-f47.google.com with SMTP id 11so1682478fxg.34 for ; Mon, 27 Jun 2011 02:22:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=V1v3bdPgkJQjBF7bbwXh44ZdW9ZO8+kEZcTYxvZJhJI=; b=BlJVnWuCPBu0RPhQXbIFgUvSmmRtUH7yopj6F7SLjUets9T+2WNCc3kV3Qs2kjltYV DnKgPfOn69bJ6huFfmTUWAseJHuskYX6OOpJpFmrkE9beRqeT/8Byf98c2L/Hd9kyuXS BHN4nz/N/+3gtcSfeeU7wCHSqaYy5tBmaZk6Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=oO9Ma//zfoug5ki/UJ629S20z54ki1tjDWGDmEER4m1Bx78h7Vu0OMljYvxETc1qUw rkJP+lur6Pui35ID+cqy9c76/l9dhs3WpdpGc+Q0kZmg5ABRkVE9u/YNMNV3GPd/+AQD +iasp61372Ixt508uChhfJr07yKdKk9LuBEGw= Received: by 10.223.127.213 with SMTP id h21mr8666101fas.45.1309166557427; Mon, 27 Jun 2011 02:22:37 -0700 (PDT) Received: from localhost.localdomain (gbibp9ph1--blueice3n2.emea.ibm.com [195.212.29.84]) by mx.google.com with ESMTPS id r10sm3401674fah.2.2011.06.27.02.22.34 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 27 Jun 2011 02:22:35 -0700 (PDT) From: Stefan Hajnoczi To: Date: Mon, 27 Jun 2011 10:21:22 +0100 Message-Id: <1309166486-10530-2-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1309166486-10530-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1309166486-10530-1-git-send-email-stefanha@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.161.47 Cc: Kevin Wolf , Anthony Liguori , Stefan Hajnoczi , Michael Roth , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Venkateswararao Jujjuri Subject: [Qemu-devel] [PATCH v6 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 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 38afdb8..05bd61d 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 e523976..c7661bc 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