From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dd4mN-0003SZ-4q for qemu-devel@nongnu.org; Wed, 02 Aug 2017 21:18:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dd4mJ-0003hT-11 for qemu-devel@nongnu.org; Wed, 02 Aug 2017 21:18:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42290) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dd4mI-0003h8-Na for qemu-devel@nongnu.org; Wed, 02 Aug 2017 21:18:18 -0400 Date: Thu, 3 Aug 2017 04:18:14 +0300 From: "Michael S. Tsirkin" Message-ID: <20170803041740-mutt-send-email-mst@kernel.org> References: <20170728141309.14275-1-marcandre.lureau@redhat.com> <20170728141309.14275-2-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20170728141309.14275-2-marcandre.lureau@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 1/2] build-sys: add --disable-vhost-user List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-1?Q?Marc-Andr=E9?= Lureau Cc: qemu-devel@nongnu.org, philippe.mathieu.daude@gmail.com, Cornelia Huck , Christian Borntraeger , Alexander Graf On Fri, Jul 28, 2017 at 04:13:08PM +0200, Marc-Andr=E9 Lureau wrote: > Learn to compile out vhost-user. Keep it enabled by default on > non-win32, that is assumed to be POSIX. Fail if trying to enable it on > win32. >=20 > When trying to make a vhost-user netdev, it gives the following error: >=20 > -netdev vhost-user,id=3Dfoo,chardev=3Dchr-test: Parameter 'type' expect= s a netdev backend type >=20 > And similar error with the HMP/QMP monitors. >=20 > While at it, rename CONFIG_VHOST_NET_TEST CONFIG_VHOST_USER_NET_TEST > since it's a vhost-user specific variable. >=20 > Signed-off-by: Marc-Andr=E9 Lureau OK so pls address Cornelia's comment and post just patch 1 as it seems appropriate for 2.10. > --- > hw/virtio/virtio-pci.c | 4 ++-- > configure | 29 +++++++++++++++++++++++++++-- > default-configs/pci.mak | 2 +- > default-configs/s390x-softmmu.mak | 2 +- > tests/Makefile.include | 6 +++--- > 5 files changed, 34 insertions(+), 9 deletions(-) >=20 > diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c > index 5d14bd66dc..8b0d6b69cd 100644 > --- a/hw/virtio/virtio-pci.c > +++ b/hw/virtio/virtio-pci.c > @@ -2135,7 +2135,7 @@ static const TypeInfo vhost_scsi_pci_info =3D { > }; > #endif > =20 > -#ifdef CONFIG_LINUX > +#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX) > /* vhost-user-scsi-pci */ > static Property vhost_user_scsi_pci_properties[] =3D { > DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, > @@ -2665,7 +2665,7 @@ static void virtio_pci_register_types(void) > #ifdef CONFIG_VHOST_SCSI > type_register_static(&vhost_scsi_pci_info); > #endif > -#ifdef CONFIG_LINUX > +#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX) > type_register_static(&vhost_user_scsi_pci_info); > #endif > #ifdef CONFIG_VHOST_VSOCK > diff --git a/configure b/configure > index 987f59ba88..efec1a613e 100755 > --- a/configure > +++ b/configure > @@ -306,6 +306,7 @@ tcg=3D"yes" > vhost_net=3D"no" > vhost_scsi=3D"no" > vhost_vsock=3D"no" > +vhost_user=3D"" > kvm=3D"no" > hax=3D"no" > rdma=3D"" > @@ -1282,6 +1283,15 @@ for opt do > ;; > --enable-vxhs) vxhs=3D"yes" > ;; > + --disable-vhost-user) vhost_user=3D"no" > + ;; > + --enable-vhost-user) > + vhost_user=3D"yes" > + if test "$mingw32" =3D "yes" ; then > + echo "ERROR: vhost-user isn't available on win32" > + exit 1 > + fi > + ;; > *) > echo "ERROR: unknown option $opt" > echo "Try '$0 --help' for more information" > @@ -1290,6 +1300,14 @@ for opt do > esac > done > =20 > +if test "$vhost_user" =3D ""; then > + if test "$mingw32" =3D "yes" ; then > + vhost_user=3D"no" > + else > + vhost_user=3D"yes" > + fi > +fi > + > case "$cpu" in > ppc) > CPU_CFLAGS=3D"-m32" > @@ -1518,6 +1536,7 @@ disabled with --disable-FEATURE, default is enabl= ed if available: > tools build qemu-io, qemu-nbd and qemu-image tools > vxhs Veritas HyperScale vDisk backend support > crypto-afalg Linux AF_ALG crypto backend driver > + vhost-user vhost-user support > =20 > NOTE: The object files are built at the place where configure is launc= hed > EOF > @@ -5348,6 +5367,7 @@ echo "libcap-ng support $cap_ng" > echo "vhost-net support $vhost_net" > echo "vhost-scsi support $vhost_scsi" > echo "vhost-vsock support $vhost_vsock" > +echo "vhost-user support $vhost_user" > echo "Trace backends $trace_backends" > if have_backend "simple"; then > echo "Trace output file $trace_file-" > @@ -5757,12 +5777,15 @@ fi > if test "$vhost_scsi" =3D "yes" ; then > echo "CONFIG_VHOST_SCSI=3Dy" >> $config_host_mak > fi > -if test "$vhost_net" =3D "yes" ; then > +if test "$vhost_net" =3D "yes" -a "$vhost_user" =3D "yes"; then > echo "CONFIG_VHOST_NET_USED=3Dy" >> $config_host_mak > fi > if test "$vhost_vsock" =3D "yes" ; then > echo "CONFIG_VHOST_VSOCK=3Dy" >> $config_host_mak > fi > +if test "$vhost_user" =3D "yes" ; then > + echo "CONFIG_VHOST_USER=3Dy" >> $config_host_mak > +fi > if test "$blobs" =3D "yes" ; then > echo "INSTALL_BLOBS=3Dyes" >> $config_host_mak > fi > @@ -6358,7 +6381,9 @@ if supported_kvm_target $target; then > 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_$target_name=3Dy" >> $config_host_= mak > + if test "$vhost_user" =3D "yes" ; then > + echo "CONFIG_VHOST_USER_NET_TEST_$target_name=3Dy" >> $con= fig_host_mak > + fi > fi > fi > if supported_hax_target $target; then > diff --git a/default-configs/pci.mak b/default-configs/pci.mak > index acaa70301a..a758630d30 100644 > --- a/default-configs/pci.mak > +++ b/default-configs/pci.mak > @@ -43,4 +43,4 @@ CONFIG_VGA=3Dy > CONFIG_VGA_PCI=3Dy > CONFIG_IVSHMEM_DEVICE=3D$(CONFIG_IVSHMEM) > CONFIG_ROCKER=3Dy > -CONFIG_VHOST_USER_SCSI=3D$(CONFIG_LINUX) > +CONFIG_VHOST_USER_SCSI=3D$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX)) > diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-= softmmu.mak > index b227a36179..51191b77df 100644 > --- a/default-configs/s390x-softmmu.mak > +++ b/default-configs/s390x-softmmu.mak > @@ -1,6 +1,6 @@ > CONFIG_PCI=3Dy > CONFIG_VIRTIO_PCI=3Dy > -CONFIG_VHOST_USER_SCSI=3D$(CONFIG_LINUX) > +CONFIG_VHOST_USER_SCSI=3D$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX)) > CONFIG_VIRTIO=3Dy > CONFIG_SCLPCONSOLE=3Dy > CONFIG_TERMINAL3270=3Dy > diff --git a/tests/Makefile.include b/tests/Makefile.include > index 7af278db55..8f5a3a1cb6 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -255,9 +255,9 @@ check-qtest-i386-y +=3D tests/pc-cpu-test$(EXESUF) > check-qtest-i386-y +=3D tests/q35-test$(EXESUF) > check-qtest-i386-y +=3D tests/vmgenid-test$(EXESUF) > gcov-files-i386-y +=3D hw/pci-host/q35.c > -check-qtest-i386-$(CONFIG_VHOST_NET_TEST_i386) +=3D tests/vhost-user-t= est$(EXESUF) > -ifeq ($(CONFIG_VHOST_NET_TEST_i386),) > -check-qtest-x86_64-$(CONFIG_VHOST_NET_TEST_x86_64) +=3D tests/vhost-us= er-test$(EXESUF) > +check-qtest-i386-$(CONFIG_VHOST_USER_NET_TEST_i386) +=3D tests/vhost-u= ser-test$(EXESUF) > +ifeq ($(CONFIG_VHOST_USER_NET_TEST_i386),) > +check-qtest-x86_64-$(CONFIG_VHOST_USER_NET_TEST_x86_64) +=3D tests/vho= st-user-test$(EXESUF) > endif > check-qtest-i386-y +=3D tests/test-netfilter$(EXESUF) > check-qtest-i386-y +=3D tests/test-filter-mirror$(EXESUF) > --=20 > 2.14.0.rc0.1.g40ca67566