From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40417)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1ZpEAj-0006kw-93
	for qemu-devel@nongnu.org; Thu, 22 Oct 2015 07:36:42 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1ZpEAg-0007IY-42
	for qemu-devel@nongnu.org; Thu, 22 Oct 2015 07:36:41 -0400
Received: from mx1.redhat.com ([209.132.183.28]:58725)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1ZpEAf-0007IS-Uq
	for qemu-devel@nongnu.org; Thu, 22 Oct 2015 07:36:38 -0400
Date: Thu, 22 Oct 2015 14:36:20 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20151022143532-mutt-send-email-mst@redhat.com>
References: <1445423133-5119-1-git-send-email-mst@redhat.com>
	<1445423133-5119-5-git-send-email-mst@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
In-Reply-To: <1445423133-5119-5-git-send-email-mst@redhat.com>
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PULL 04/38] tests: re-enable vhost-user-test
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>, Michael Tokarev <mjt@tls.msk.ru>, Markus Armbruster <armbru@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, =?us-ascii?B?PT9VVEYtOD9xP01hcmMtQW5kcj1DMz1BOT0yMEx1cmVhdT89?= <marcandre.lureau@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>

On Wed, Oct 21, 2015 at 01:26:36PM +0300, Michael S. Tsirkin wrote:
> From: Marc-Andr=E9 Lureau <marcandre.lureau@redhat.com>
>=20
> Commit 7fe34ca9c2e actually disabled vhost-user-test altogether,
> since CONFIG_VHOST_NET is a per-target config variable.
>=20
> tests/vhost-user-test is already x86/64 softmmu specific test, in order
> to enable it correctly, kvm & vhost-net are also conditions. To check
> that, set CONFIG_VHOST_NET_TEST when kvm is also enabled.
>=20
> Signed-off-by: Marc-Andr=E9 Lureau <marcandre.lureau@redhat.com>
> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

I dropped this one since it still breaks on some setups.
Marc-Andr=E9, pls work to re-enable this upstream
when you are back.

> ---
>  configure      | 1 +
>  tests/Makefile | 4 +---
>  2 files changed, 2 insertions(+), 3 deletions(-)
>=20
> diff --git a/configure b/configure
> index f08327e..9eec860 100755
> --- a/configure
> +++ b/configure
> @@ -5562,6 +5562,7 @@ case "$target_name" in
>        echo "CONFIG_KVM=3Dy" >> $config_target_mak
>        if test "$vhost_net" =3D "yes" ; then
>          echo "CONFIG_VHOST_NET=3Dy" >> $config_target_mak
> +        echo "CONFIG_VHOST_NET_TEST=3Dy" >> $config_host_mak
>        fi
>      fi
>  esac
> diff --git a/tests/Makefile b/tests/Makefile
> index cb221de..d69e097 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -191,9 +191,7 @@ gcov-files-i386-y +=3D hw/usb/hcd-xhci.c
>  check-qtest-i386-y +=3D tests/pc-cpu-test$(EXESUF)
>  check-qtest-i386-y +=3D tests/q35-test$(EXESUF)
>  gcov-files-i386-y +=3D hw/pci-host/q35.c
> -ifeq ($(CONFIG_VHOST_NET),y)
> -check-qtest-i386-$(CONFIG_LINUX) +=3D tests/vhost-user-test$(EXESUF)
> -endif
> +check-qtest-i386-$(CONFIG_VHOST_NET_TEST) +=3D tests/vhost-user-test$(=
EXESUF)
>  check-qtest-i386-y +=3D tests/test-netfilter$(EXESUF)
>  check-qtest-x86_64-y =3D $(check-qtest-i386-y)
>  gcov-files-i386-y +=3D i386-softmmu/hw/timer/mc146818rtc.c
> --=20
> MST
>=20