Re: [Qemu-devel] [PATCH] tests: re-enable vhost-user-test

[Marc-André Lureau]

nack, CONFIG_VHOST_NET_USED is actually used, my bad. I'll send another patch

On Thu, Oct 15, 2015 at 2:07 PM,  <address@hidden> wrote:
> From: Marc-André Lureau <address@hidden>
>
> Commit 7fe34ca9c2e actually disabled vhost-user-test altogether,
> since CONFIG_VHOST_NET is a per-target config variable.
>
> CONFIG_VHOST_NET_USED is the host config, actually unused since
> 1322629b4f2. But it was set whenever vhost_net was enabled.
>
> 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, change CONFIG_VHOST_NET_USED to be set when kvm is also enabled.
>
> Signed-off-by: Marc-André Lureau <address@hidden>
> ---
>  configure      | 4 +---
>  tests/Makefile | 4 +---
>  2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/configure b/configure
> index 7b5fcd2..bd2ffaf 100755
> --- a/configure
> +++ b/configure
> @@ -5033,9 +5033,6 @@ fi
>  if test "$vhost_scsi" = "yes" ; then
>    echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak
>  fi
> -if test "$vhost_net" = "yes" ; then
> -  echo "CONFIG_VHOST_NET_USED=y" >> $config_host_mak
> -fi
>  if test "$blobs" = "yes" ; then
>    echo "INSTALL_BLOBS=yes" >> $config_host_mak
>  fi
> @@ -5581,6 +5578,7 @@ case "$target_name" in
>        echo "CONFIG_KVM=y" >> $config_target_mak
>        if test "$vhost_net" = "yes" ; then
>          echo "CONFIG_VHOST_NET=y" >> $config_target_mak
> +        echo "CONFIG_VHOST_NET_USED=y" >> $config_host_mak
>        fi
>      fi
>  esac
> diff --git a/tests/Makefile b/tests/Makefile
> index 209eca9..7eb70b3 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -191,9 +191,7 @@ gcov-files-i386-y += hw/usb/hcd-xhci.c
>  check-qtest-i386-y += tests/pc-cpu-test$(EXESUF)
>  check-qtest-i386-y += tests/q35-test$(EXESUF)
>  gcov-files-i386-y += hw/pci-host/q35.c
> -ifeq ($(CONFIG_VHOST_NET),y)
> -check-qtest-i386-$(CONFIG_LINUX) += tests/vhost-user-test$(EXESUF)
> -endif
> +check-qtest-i386-$(CONFIG_VHOST_NET_USED) += tests/vhost-user-test$(EXESUF)
>  check-qtest-i386-y += tests/test-netfilter$(EXESUF)
>  check-qtest-x86_64-y = $(check-qtest-i386-y)
>  gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c
> --
> 2.4.3
>



-- 
Marc-André Lureau