Re: [Qemu-devel] [PATCH v5 1/5] Add hard build dependency on glib

[Andreas Färber]

Am 12.06.2011 um 22:46 schrieb Stefan Hajnoczi:

> 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>
> Signed-off-by: Stefan Hajnoczi <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 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 <<EOF

This hunk no longer applies.

Andreas

> @@ -2923,6 +2935,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.5.3