From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XTt2A-0000oy-3k for qemu-devel@nongnu.org; Tue, 16 Sep 2014 09:43:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XTt22-0002we-GO for qemu-devel@nongnu.org; Tue, 16 Sep 2014 09:43:05 -0400 Received: from mail.kernel.org ([198.145.19.201]:53923) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XTt22-0002vN-8u for qemu-devel@nongnu.org; Tue, 16 Sep 2014 09:42:58 -0400 Date: Tue, 16 Sep 2014 17:43:24 +0300 From: "Michael S. Tsirkin" Message-ID: <20140916144324.GA7804@redhat.com> References: <1410719879-25181-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PULL 00/12] pci, pc, virtio, misc bugfixes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: QEMU Developers On Mon, Sep 15, 2014 at 01:30:40PM -0700, Peter Maydell wrote: > On 14 September 2014 11:41, Michael S. Tsirkin wrote: > > The following changes since commit 4c24f4004089a308c5de8ed720cf6bd174= 6aedd8: > > > > 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_upstrea= m > > > > for you to fetch changes up to 36a315ef05921aef7a386ec08d866fbe3f626e= 08: > > > > vhost-user: fix VIRTIO_NET_F_MRG_RXBUF negotiation (2014-09-14 21:3= 3: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 > > >=20 > Hi. I'm afraid this doesn't build for me: >=20 > /root/qemu/tests/test-qdev-global-props.c: In function =E2=80=98test_st= atic_prop=E2=80=99: > /root/qemu/tests/test-qdev-global-props.c:80:5: error: implicit > declaration of function =E2=80=98g_test_trap_subprocess=E2=80=99 > [-Werror=3Dimplicit-function-declaration] > /root/qemu/tests/test-qdev-global-props.c:80:5: error: nested extern > declaration of =E2=80=98g_test_trap_subprocess=E2=80=99 [-Werror=3Dnest= ed-externs] >=20 > This function was only added in glib 2.38, and our > minimum version is 2.12. >=20 > thanks > -- PMM The following should help? Signed-off-by: Michael S. Tsirkin 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 =20 +# g_test_trap_subprocess added in 2.38. Used by some tests. +glib_subprocess=3Dyes +if ! $pkg_config --atleast-version=3D2.38 glib-2.0; then + glib_subprocess=3Dno +fi + ########################################## # SHA command probe for modules if test "$modules" =3D yes; then @@ -4585,6 +4591,9 @@ if test "$bluez" =3D "yes" ; then echo "CONFIG_BLUEZ=3Dy" >> $config_host_mak echo "BLUEZ_CFLAGS=3D$bluez_cflags" >> $config_host_mak fi +if test "glib_subprocess" =3D "yes" ; then + echo "CONFIG_HAS_GLIB_SUBPROCESS_TESTS=3Dy" >> $config_host_mak +fi echo "GLIB_CFLAGS=3D$glib_cflags" >> $config_host_mak if test "$gtk" =3D "yes" ; then echo "CONFIG_GTK=3Dy" >> $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 +=3D tests/test-int128$(EXESUF) # all code tested by test-int128 is inside int128.h gcov-files-test-int128-y =3D check-unit-y +=3D tests/test-bitops$(EXESUF) -check-unit-y +=3D tests/test-qdev-global-props$(EXESUF) +check-unit-$(CONFIG_HAS_GLIB_SUBPROCESS_TESTS) +=3D tests/test-qdev-glob= al-props$(EXESUF) check-unit-y +=3D tests/check-qom-interface$(EXESUF) gcov-files-check-qom-interface-y =3D qom/object.c check-unit-$(CONFIG_POSIX) +=3D tests/test-vmstate$(EXESUF)