[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 04/38] tests: re-enable vhost-user-test
From: |
Michael S. Tsirkin |
Subject: |
Re: [Qemu-devel] [PULL 04/38] tests: re-enable vhost-user-test |
Date: |
Thu, 22 Oct 2015 14:36:20 +0300 |
On Wed, Oct 21, 2015 at 01:26:36PM +0300, Michael S. Tsirkin 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.
>
> 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.
>
> Signed-off-by: Marc-André Lureau <address@hidden>
> Reviewed-by: Michael S. Tsirkin <address@hidden>
> Signed-off-by: Michael S. Tsirkin <address@hidden>
I dropped this one since it still breaks on some setups.
Marc-André, pls work to re-enable this upstream
when you are back.
> ---
> configure | 1 +
> tests/Makefile | 4 +---
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> 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=y" >> $config_target_mak
> if test "$vhost_net" = "yes" ; then
> echo "CONFIG_VHOST_NET=y" >> $config_target_mak
> + echo "CONFIG_VHOST_NET_TEST=y" >> $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 += 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_TEST) += 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
> --
> MST
>
- [Qemu-devel] [PULL 00/38] vhost, pc, virtio features, fixes, cleanups, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 01/38] intel_iommu: Add support for translation for devices behind bridges, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 02/38] exec: factor out duplicate mmap code, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 03/38] net: don't set native endianness, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 04/38] tests: re-enable vhost-user-test, Michael S. Tsirkin, 2015/10/21
- Re: [Qemu-devel] [PULL 04/38] tests: re-enable vhost-user-test,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 06/38] pc-dimm: add vhost slots limit check before commiting to hotplug, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 07/38] vhost: fail backend intialization early, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 05/38] vhost: add vhost_has_free_slot() interface, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 08/38] virtio: add some migration doc, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 09/38] configure: probe for memfd, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 11/38] build-sys: split util-obj- on multi-lines, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 12/38] util: add linux-only memfd fallback, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 13/38] util: add memfd helpers, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 14/38] util: add fallback for qemu_memfd_alloc(), Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 15/38] vhost: document log resizing, Michael S. Tsirkin, 2015/10/21