Re: [Qemu-devel] [PULL 00/12] pci, pc, virtio, misc bugfixes

[Michael S. Tsirkin]

On Mon, Sep 15, 2014 at 01:30:40PM -0700, Peter Maydell wrote:
> On 14 September 2014 11:41, Michael S. Tsirkin <address@hidden> wrote:
> > The following changes since commit 4c24f4004089a308c5de8ed720cf6bd1746aedd8:
> >
> >   Merge remote-tracking branch 
> > 'remotes/pmaydell/tags/pull-target-arm-20140912' into staging (2014-09-12 
> > 15:12:26 +0100)
> >
> > are available in the git repository at:
> >
> >   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
> >
> > for you to fetch changes up to 36a315ef05921aef7a386ec08d866fbe3f626e08:
> >
> >   vhost-user: fix VIRTIO_NET_F_MRG_RXBUF negotiation (2014-09-14 21:33:01 
> > +0300)
> >
> > ----------------------------------------------------------------
> > pci, pc, virtio, misc bugfixes
> >
> > A bunch of bugfixes - some of these will make sense for 2.1.2
> > Cc: qemu-stable included where appropriate.
> >
> > Signed-off-by: Michael S. Tsirkin <address@hidden>
> >
> 
> Hi. I'm afraid this doesn't build for me:
> 
> /root/qemu/tests/test-qdev-global-props.c: In function ‘test_static_prop’:
> /root/qemu/tests/test-qdev-global-props.c:80:5: error: implicit
> declaration of function ‘g_test_trap_subprocess’
> [-Werror=implicit-function-declaration]
> /root/qemu/tests/test-qdev-global-props.c:80:5: error: nested extern
> declaration of ‘g_test_trap_subprocess’ [-Werror=nested-externs]
> 
> This function was only added in glib 2.38, and our
> minimum version is 2.12.
> 
> thanks
> -- PMM

The following should help?

Signed-off-by: Michael S. Tsirkin <address@hidden>

diff --git a/configure b/configure
index 961bf6f..6f1284a 100755
--- a/configure
+++ b/configure
@@ -2716,6 +2716,12 @@ for i in $glib_modules; do
     fi
 done
 
+# g_test_trap_subprocess added in 2.38. Used by some tests.
+glib_subprocess=yes
+if ! $pkg_config --atleast-version=2.38 glib-2.0; then
+    glib_subprocess=no
+fi
+
 ##########################################
 # SHA command probe for modules
 if test "$modules" = yes; then
@@ -4585,6 +4591,9 @@ if test "$bluez" = "yes" ; then
   echo "CONFIG_BLUEZ=y" >> $config_host_mak
   echo "BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak
 fi
+if test "glib_subprocess" = "yes" ; then
+  echo "CONFIG_HAS_GLIB_SUBPROCESS_TESTS=y" >> $config_host_mak
+fi
 echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
 if test "$gtk" = "yes" ; then
   echo "CONFIG_GTK=y" >> $config_host_mak
diff --git a/tests/Makefile b/tests/Makefile
index d5db97b..a5e3d0c 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -58,7 +58,7 @@ check-unit-y += tests/test-int128$(EXESUF)
 # all code tested by test-int128 is inside int128.h
 gcov-files-test-int128-y =
 check-unit-y += tests/test-bitops$(EXESUF)
-check-unit-y += tests/test-qdev-global-props$(EXESUF)
+check-unit-$(CONFIG_HAS_GLIB_SUBPROCESS_TESTS) += 
tests/test-qdev-global-props$(EXESUF)
 check-unit-y += tests/check-qom-interface$(EXESUF)
 gcov-files-check-qom-interface-y = qom/object.c
 check-unit-$(CONFIG_POSIX) += tests/test-vmstate$(EXESUF)