From 28a1ccca41bfa92134b075373956f633c99ebcaf Mon Sep 17 00:00:00 2001 From: Huawei Xie Date: Thu, 12 Mar 2015 23:30:23 +0800 Subject: [PATCH] vhost: add build option for vhost-user Turn on CONFIG_RTE_LIBRTE_VHOST to enable vhost. vhost-user is turned on by default. Turn off CONFIG_RTE_LIBRTE_VHOST_USER to enable vhost-cuse implementation. Signed-off-by: Huawei Xie Acked-by: Changchun Ouyang --- config/common_linuxapp | 4 +++- lib/librte_vhost/Makefile | 11 +++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/config/common_linuxapp b/config/common_linuxapp index 97f1c9ee23..09a58acff5 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -414,10 +414,12 @@ CONFIG_RTE_KNI_VHOST_DEBUG_TX=n # # Compile vhost library -# fuse-devel is needed to run vhost. +# fuse-devel is needed to run vhost-cuse. # fuse-devel enables user space char driver development +# vhost-user is turned on by default. # CONFIG_RTE_LIBRTE_VHOST=n +CONFIG_RTE_LIBRTE_VHOST_USER=y CONFIG_RTE_LIBRTE_VHOST_DEBUG=n # diff --git a/lib/librte_vhost/Makefile b/lib/librte_vhost/Makefile index 52f65752c1..a8645a664a 100644 --- a/lib/librte_vhost/Makefile +++ b/lib/librte_vhost/Makefile @@ -39,13 +39,20 @@ EXPORT_MAP := rte_vhost_version.map LIBABIVER := 1 CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -D_FILE_OFFSET_BITS=64 -CFLAGS += -I vhost_cuse -lfuse +ifeq ($(CONFIG_RTE_LIBRTE_VHOST_USER),y) CFLAGS += -I vhost_user +else +CFLAGS += -I vhost_cuse -lfuse LDFLAGS += -lfuse +endif + # all source are stored in SRCS-y SRCS-$(CONFIG_RTE_LIBRTE_VHOST) := virtio-net.c vhost_rxtx.c -#SRCS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_cuse/vhost-net-cdev.c vhost_cuse/virtio-net-cdev.c vhost_cuse/eventfd_copy.c +ifeq ($(CONFIG_RTE_LIBRTE_VHOST_USER),y) SRCS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_user/vhost-net-user.c vhost_user/virtio-net-user.c vhost_user/fd_man.c +else +SRCS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_cuse/vhost-net-cdev.c vhost_cuse/virtio-net-cdev.c vhost_cuse/eventfd_copy.c +endif # install includes SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_virtio_net.h -- 2.20.1