On Fri, 28 Jul 2017 16:13:08 +0200 Marc-André Lureau <marcandre.lur...@redhat.com> 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. > > When trying to make a vhost-user netdev, it gives the following error: > > -netdev vhost-user,id=foo,chardev=chr-test: Parameter 'type' expects a netdev > backend type > > And similar error with the HMP/QMP monitors. > > While at it, rename CONFIG_VHOST_NET_TEST CONFIG_VHOST_USER_NET_TEST > since it's a vhost-user specific variable. > > Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> > --- > 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(-) > (...) > diff --git a/configure b/configure > index 987f59ba88..efec1a613e 100755 > --- a/configure > +++ b/configure > @@ -306,6 +306,7 @@ tcg="yes" > vhost_net="no" > vhost_scsi="no" > vhost_vsock="no" > +vhost_user="" > kvm="no" > hax="no" > rdma="" > @@ -1282,6 +1283,15 @@ for opt do > ;; > --enable-vxhs) vxhs="yes" > ;; > + --disable-vhost-user) vhost_user="no" > + ;; > + --enable-vhost-user) > + vhost_user="yes" > + if test "$mingw32" = "yes" ; then > + echo "ERROR: vhost-user isn't available on win32" > + exit 1 error_exit? > + fi > + ;; > *) > echo "ERROR: unknown option $opt" > echo "Try '$0 --help' for more information" (...) > 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=y > CONFIG_VIRTIO_PCI=y > -CONFIG_VHOST_USER_SCSI=$(CONFIG_LINUX) > +CONFIG_VHOST_USER_SCSI=$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX)) Huh. I wonder if anyone actually tried this on s390x? (The change is fine in the context of this patch, of course.) > CONFIG_VIRTIO=y > CONFIG_SCLPCONSOLE=y > CONFIG_TERMINAL3270=y
