diff mbox

[PULL,14/15] vhost-user-test: use tmpfs by default

Message ID 20151006020328-mutt-send-email-mst@redhat.com
State New
Headers show

Commit Message

Michael S. Tsirkin Oct. 5, 2015, 11:04 p.m. UTC 
On Mon, Oct 05, 2015 at 11:39:39PM +0100, Peter Maydell wrote:
> On 2 October 2015 at 14:45, Michael S. Tsirkin <mst@redhat.com> wrote:
> > Most people don't run make check by default, so they skip vhost-user
> > unit tests.  Solve this by using tmpfs instead, unless hugetlbfs is
> > specified (using an environment variable).
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Unfortunately I didn't notice before applying the pull, but this
> is breaking 'make check' on AArch64 host for me:
> 
> TEST: tests/vhost-user-test... (pid=20205)
> Warning: path not on HugeTLBFS: /tmp/vhost-test-gRpbwl
> qemu-system-i386: -netdev vhost-user,id=net0,chardev=chr0,vhostforce:
> vhost-net support is not compiled in
> qemu-system-i386: -netdev vhost-user,id=net0,chardev=chr0,vhostforce:
> failed to init vhost_net for queue 0
> 
> Broken pipe
> FAIL: tests/vhost-user-test
> 
> Probably reproducible on x86 if you configure with --disable-vhost-net,
> though I haven't tried that.
> 
> Perhaps tests/vhost-user-test should be set up
> in tests/Makefile using
> check-qtest-i386-$(CONFIG_VHOST_USER) rather
> than CONFIG_LINUX ?
> 
> I'd appreciate a quick fix, because this machine is in my set
> of systems I test all pullreqs on now...
> 
> thanks
> -- PMM


ok first of all we need this: if I apply it, I see the same
bug as you do. need to fix that too.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
diff mbox

Patch

diff --git a/net/net.c b/net/net.c
index 28a5597..1e6a082 100644
--- a/net/net.c
+++ b/net/net.c
@@ -902,9 +902,7 @@  static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND_MAX])(
         [NET_CLIENT_OPTIONS_KIND_BRIDGE]    = net_init_bridge,
 #endif
         [NET_CLIENT_OPTIONS_KIND_HUBPORT]   = net_init_hubport,
-#ifdef CONFIG_VHOST_NET_USED
         [NET_CLIENT_OPTIONS_KIND_VHOST_USER] = net_init_vhost_user,
-#endif
 #ifdef CONFIG_L2TPV3
         [NET_CLIENT_OPTIONS_KIND_L2TPV3]    = net_init_l2tpv3,
 #endif