From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zqg6R-0002BB-JU for qemu-devel@nongnu.org; Mon, 26 Oct 2015 07:38:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zqg6M-00065t-Jz for qemu-devel@nongnu.org; Mon, 26 Oct 2015 07:38:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60539) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zqg6M-000657-Eo for qemu-devel@nongnu.org; Mon, 26 Oct 2015 07:38:10 -0400 Date: Mon, 26 Oct 2015 13:38:07 +0200 From: "Michael S. Tsirkin" Message-ID: <20151026133045-mutt-send-email-mst@redhat.com> References: <1444919965-4327-1-git-send-email-marcandre.lureau@redhat.com> <20151024224257-mutt-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] tests: re-enable vhost-user-test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-1?Q?Marc-Andr=E9?= Lureau Cc: QEMU On Mon, Oct 26, 2015 at 12:25:38PM +0100, Marc-Andr=E9 Lureau wrote: > Hi >=20 > On Sat, Oct 24, 2015 at 9:44 PM, Michael S. Tsirkin wr= ote: > > On Thu, Oct 15, 2015 at 04:39:25PM +0200, marcandre.lureau@redhat.com= wrote: > >> From: Marc-Andr=E9 Lureau > >> > >> Commit 7fe34ca9c2e actually disabled vhost-user-test altogether, > >> since CONFIG_VHOST_NET is a per-target config variable. > >> > >> tests/vhost-user-test is already x86/64 softmmu specific test, in or= der > >> to enable it correctly, kvm & vhost-net are also conditions. To chec= k > >> that, set CONFIG_VHOST_NET_TEST when kvm is also enabled. > >> > >> Signed-off-by: Marc-Andr=E9 Lureau > > > > I had to drop this, this still seems to break on some configs. > > Pls work to fix this up. >=20 > I am not sure I understand completely the issue that Peter is having > on arm. I suppose my arm VM doesn't have kvm, and fails to reproduce > it. What probably happens is that CONFIG_VHOST_NET_TEST is enabled > because "$target_name" =3D "$cpu" for $target_name =3D aarch64, then t= he > test is trying to run with the qemu-system-i386 binary, but that one > doesn't have vhost-net. We would probably need something like that > (pseudo-code, I failed to express this with Makefile): >=20 > @@ -5652,6 +5654,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+=3D$cpu" >> $config_host_mak > fi > fi > esac > diff --git a/tests/Makefile b/tests/Makefile > index 9341498..40fd02a 100644 > --- a/tests/Makefile > +++ b/tests/Makefile > @@ -192,9 +192,8 @@ 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 > +# foreach CPU in CONFIG_VHOST_NET_TEST > +# check-qtest-$(CPU)-y +=3D tests/vhost-user-test$(EXESUF) Like this then? if test target_name =3D=3D "i386" -o target_name =3D=3D "x86_64" then echo "CONFIG_VHOST_NET_TEST_$target_name=3Dy" >> $config_host_mak fi ifeq ($(CONFIG_VHOST_NET_i386),y) check-qtest-i386-y +=3D tests/vhost-user-test$(EXESUF) endif ifeq ($(CONFIG_VHOST_NET_x86_64),y) check-qtest-x86_64-y +=3D tests/vhost-user-test$(EXESUF) endif >=20 > I don't feel very confortable with that sort of per-host/per-target > complex configure-time conditions. I would rather simply use a simple > runtime test check such as: Problem with runtime checks is it makes people not notice there's a problem. --=20 MST