From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id C6A2E2BD9 for ; Thu, 18 Aug 2016 10:40:17 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 18 Aug 2016 01:39:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,538,1464678000"; d="scan'208";a="1043336163" Received: from yliu-dev.sh.intel.com ([10.239.67.162]) by fmsmga002.fm.intel.com with ESMTP; 18 Aug 2016 01:39:51 -0700 From: Yuanhan Liu To: dev@dpdk.org Cc: Yuanhan Liu Date: Thu, 18 Aug 2016 16:48:38 +0800 Message-Id: <1471510123-4984-3-git-send-email-yuanhan.liu@linux.intel.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1471510123-4984-1-git-send-email-yuanhan.liu@linux.intel.com> References: <1471510123-4984-1-git-send-email-yuanhan.liu@linux.intel.com> Subject: [dpdk-dev] [PATCH 2/7] vhost: remove sub source dir X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Aug 2016 08:40:18 -0000 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 --- 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