[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1][ 01/23] Add hard build dependency on glib
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH v1][ 01/23] Add hard build dependency on glib |
Date: |
Tue, 17 May 2011 19:51:48 -0500 |
From: Anthony Liguori <address@hidden>
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 <address@hidden>
Signed-off-by: Michael Roth <address@hidden>
---
Makefile | 2 ++
Makefile.objs | 2 ++
Makefile.target | 1 +
configure | 13 +++++++++++++
4 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index 2b0438c..5d39363 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 4478c61..c49e44c 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -365,3 +365,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 2e281a4..dbea7a2 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -204,6 +204,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 d7dba5d..fa95568 100755
--- a/configure
+++ b/configure
@@ -1763,6 +1763,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_softmmu"
+else
+ echo "glib-2.0 required to compile QEMU"
+ exit 1
+fi
+
+##########################################
# kvm probe
if test "$kvm" != "no" ; then
cat > $TMPC <<EOF
@@ -2936,6 +2948,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
--
1.7.0.4
- [Qemu-devel] [PATCH v1 00/23] QAPI Infrastructure Round 1, Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 02/23] error-propagation: base code for error propagation, Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 01/23] Add hard build dependency on glib,
Michael Roth <=
- [Qemu-devel] [PATCH v1][ 04/23] qerror: refactor error to make the human message reusable, Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 05/23] qlist: add qlist_first()/qlist_next(), Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 03/23] error-propagation: build qemu with with error-propagation bits, Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 07/23] qapi: add ordereddict/qapi.py helper libraries, Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 06/23] qapi: add module init types for qapi, Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 08/23] qapi: add qapi-types.py code generator, Michael Roth, 2011/05/17