We now have one vhost implementation; no sub source dir is needed.
Rmove it by move them to upper dir.
Signed-off-by: Yuanhan Liu <yuanhan.liu at linux.intel.com>
---
lib/librte_vhost/Makefile | 6 +++---
lib/librte_vhost/{vhost_user => }/fd_man.c | 0
lib/librte_vhost/{vhost_user => }/fd_man.h | 0
lib/librte_vhost/{vhost_user => }/vhost-net-user.c | 0
lib/librte_vhost/{vhost_user => }/vhost-net-user.h | 0
lib/librte_vhost/{vhost_user => }/virtio-net-user.c | 0
lib/librte_vhost/{vhost_user => }/virtio-net-user.h | 0
7 files changed, 3 insertions(+), 3 deletions(-)
rename lib/librte_vhost/{vhost_user => }/fd_man.c (100%)
rename lib/librte_vhost/{vhost_user => }/fd_man.h (100%)
rename lib/librte_vhost/{vhost_user => }/vhost-net-user.c (100%)
rename lib/librte_vhost/{vhost_user => }/vhost-net-user.h (100%)
rename lib/librte_vhost/{vhost_user => }/virtio-net-user.c (100%)
rename lib/librte_vhost/{vhost_user => }/virtio-net-user.h (100%)
diff --git a/lib/librte_vhost/Makefile b/lib/librte_vhost/Makefile
index fb4e7f8..277390f 100644
--- a/lib/librte_vhost/Makefile
+++ b/lib/librte_vhost/Makefile
@@ -48,9 +48,9 @@ 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_user/vhost-net-user.c
-SRCS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_user/virtio-net-user.c
-SRCS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_user/fd_man.c
+SRCS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost-net-user.c
+SRCS-$(CONFIG_RTE_LIBRTE_VHOST) += virtio-net-user.c
+SRCS-$(CONFIG_RTE_LIBRTE_VHOST) += fd_man.c
# install includes
SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_virtio_net.h
diff --git a/lib/librte_vhost/vhost_user/fd_man.c b/lib/librte_vhost/fd_man.c
similarity index 100%
rename from lib/librte_vhost/vhost_user/fd_man.c
rename to lib/librte_vhost/fd_man.c
diff --git a/lib/librte_vhost/vhost_user/fd_man.h b/lib/librte_vhost/fd_man.h
similarity index 100%
rename from lib/librte_vhost/vhost_user/fd_man.h
rename to lib/librte_vhost/fd_man.h
diff --git a/lib/librte_vhost/vhost_user/vhost-net-user.c
b/lib/librte_vhost/vhost-net-user.c
similarity index 100%
rename from lib/librte_vhost/vhost_user/vhost-net-user.c
rename to lib/librte_vhost/vhost-net-user.c
diff --git a/lib/librte_vhost/vhost_user/vhost-net-user.h
b/lib/librte_vhost/vhost-net-user.h
similarity index 100%
rename from lib/librte_vhost/vhost_user/vhost-net-user.h
rename to lib/librte_vhost/vhost-net-user.h
diff --git a/lib/librte_vhost/vhost_user/virtio-net-user.c
b/lib/librte_vhost/virtio-net-user.c
similarity index 100%
rename from lib/librte_vhost/vhost_user/virtio-net-user.c
rename to lib/librte_vhost/virtio-net-user.c
diff --git a/lib/librte_vhost/vhost_user/virtio-net-user.h
b/lib/librte_vhost/virtio-net-user.h
similarity index 100%
rename from lib/librte_vhost/vhost_user/virtio-net-user.h
rename to lib/librte_vhost/virtio-net-user.h
--
1.9.0
