From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 732591B369 for ; Fri, 19 Jan 2018 14:47:04 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CCB902FBF; Fri, 19 Jan 2018 13:47:03 +0000 (UTC) Received: from localhost (ovpn-116-254.ams2.redhat.com [10.36.116.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D04B18EFF; Fri, 19 Jan 2018 13:47:02 +0000 (UTC) From: Stefan Hajnoczi To: dev@dpdk.org Cc: maxime.coquelin@redhat.com, Yuanhan Liu , wei.w.wang@intel.com, mst@redhat.com, zhiyong.yang@intel.com, jasowang@redhat.com, Stefan Hajnoczi Date: Fri, 19 Jan 2018 13:44:34 +0000 Message-Id: <20180119134444.24927-15-stefanha@redhat.com> In-Reply-To: <20180119134444.24927-1-stefanha@redhat.com> References: <20180119134444.24927-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 19 Jan 2018 13:47:03 +0000 (UTC) Subject: [dpdk-dev] [RFC 14/24] vhost: move librte_vhost to drivers/ X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jan 2018 13:47:05 -0000 PCI drivers depend on the rte_bus_pci.h header file which is only available when drivers/ is built. Code in lib/ cannot depend on code in drivers/ because lib/ is built first during make install. This patch moves librte_vhost into drivers/ so that later patches can add a virtio-vhost-pci driver to librte_vhost without exporting all private vhost.h symbols. Signed-off-by: Stefan Hajnoczi --- Is there a better way of giving a PCI driver access to librte_vhost transport (not a public API that apps should use)? --- drivers/Makefile | 2 ++ {lib => drivers}/librte_vhost/Makefile | 0 lib/Makefile | 3 --- {lib => drivers}/librte_vhost/fd_man.h | 0 {lib => drivers}/librte_vhost/iotlb.h | 0 {lib => drivers}/librte_vhost/rte_vhost.h | 0 {lib => drivers}/librte_vhost/vhost.h | 0 {lib => drivers}/librte_vhost/vhost_user.h | 0 {lib => drivers}/librte_vhost/fd_man.c | 0 {lib => drivers}/librte_vhost/iotlb.c | 0 {lib => drivers}/librte_vhost/socket.c | 0 {lib => drivers}/librte_vhost/trans_af_unix.c | 0 {lib => drivers}/librte_vhost/vhost.c | 0 {lib => drivers}/librte_vhost/vhost_user.c | 0 {lib => drivers}/librte_vhost/virtio_net.c | 0 {lib => drivers}/librte_vhost/rte_vhost_version.map | 0 16 files changed, 2 insertions(+), 3 deletions(-) rename {lib => drivers}/librte_vhost/Makefile (100%) rename {lib => drivers}/librte_vhost/fd_man.h (100%) rename {lib => drivers}/librte_vhost/iotlb.h (100%) rename {lib => drivers}/librte_vhost/rte_vhost.h (100%) rename {lib => drivers}/librte_vhost/vhost.h (100%) rename {lib => drivers}/librte_vhost/vhost_user.h (100%) rename {lib => drivers}/librte_vhost/fd_man.c (100%) rename {lib => drivers}/librte_vhost/iotlb.c (100%) rename {lib => drivers}/librte_vhost/socket.c (100%) rename {lib => drivers}/librte_vhost/trans_af_unix.c (100%) rename {lib => drivers}/librte_vhost/vhost.c (100%) rename {lib => drivers}/librte_vhost/vhost_user.c (100%) rename {lib => drivers}/librte_vhost/virtio_net.c (100%) rename {lib => drivers}/librte_vhost/rte_vhost_version.map (100%) diff --git a/drivers/Makefile b/drivers/Makefile index 57e1a48a8..67f110c25 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -12,5 +12,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto DEPDIRS-crypto := bus mempool DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += event DEPDIRS-event := bus mempool net +DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += librte_vhost +DEPDIRS-librte_vhost := bus include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_vhost/Makefile b/drivers/librte_vhost/Makefile similarity index 100% rename from lib/librte_vhost/Makefile rename to drivers/librte_vhost/Makefile diff --git a/lib/Makefile b/lib/Makefile index 679912a28..dd916901b 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -30,9 +30,6 @@ DEPDIRS-librte_security += librte_ether DEPDIRS-librte_security += librte_cryptodev DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += librte_eventdev DEPDIRS-librte_eventdev := librte_eal librte_ring librte_ether librte_hash -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += librte_vhost -DEPDIRS-librte_vhost := librte_eal librte_mempool librte_mbuf librte_ether \ - librte_net DIRS-$(CONFIG_RTE_LIBRTE_HASH) += librte_hash DEPDIRS-librte_hash := librte_eal librte_ring DIRS-$(CONFIG_RTE_LIBRTE_EFD) += librte_efd diff --git a/lib/librte_vhost/fd_man.h b/drivers/librte_vhost/fd_man.h similarity index 100% rename from lib/librte_vhost/fd_man.h rename to drivers/librte_vhost/fd_man.h diff --git a/lib/librte_vhost/iotlb.h b/drivers/librte_vhost/iotlb.h similarity index 100% rename from lib/librte_vhost/iotlb.h rename to drivers/librte_vhost/iotlb.h diff --git a/lib/librte_vhost/rte_vhost.h b/drivers/librte_vhost/rte_vhost.h similarity index 100% rename from lib/librte_vhost/rte_vhost.h rename to drivers/librte_vhost/rte_vhost.h diff --git a/lib/librte_vhost/vhost.h b/drivers/librte_vhost/vhost.h similarity index 100% rename from lib/librte_vhost/vhost.h rename to drivers/librte_vhost/vhost.h diff --git a/lib/librte_vhost/vhost_user.h b/drivers/librte_vhost/vhost_user.h similarity index 100% rename from lib/librte_vhost/vhost_user.h rename to drivers/librte_vhost/vhost_user.h diff --git a/lib/librte_vhost/fd_man.c b/drivers/librte_vhost/fd_man.c similarity index 100% rename from lib/librte_vhost/fd_man.c rename to drivers/librte_vhost/fd_man.c diff --git a/lib/librte_vhost/iotlb.c b/drivers/librte_vhost/iotlb.c similarity index 100% rename from lib/librte_vhost/iotlb.c rename to drivers/librte_vhost/iotlb.c diff --git a/lib/librte_vhost/socket.c b/drivers/librte_vhost/socket.c similarity index 100% rename from lib/librte_vhost/socket.c rename to drivers/librte_vhost/socket.c diff --git a/lib/librte_vhost/trans_af_unix.c b/drivers/librte_vhost/trans_af_unix.c similarity index 100% rename from lib/librte_vhost/trans_af_unix.c rename to drivers/librte_vhost/trans_af_unix.c diff --git a/lib/librte_vhost/vhost.c b/drivers/librte_vhost/vhost.c similarity index 100% rename from lib/librte_vhost/vhost.c rename to drivers/librte_vhost/vhost.c diff --git a/lib/librte_vhost/vhost_user.c b/drivers/librte_vhost/vhost_user.c similarity index 100% rename from lib/librte_vhost/vhost_user.c rename to drivers/librte_vhost/vhost_user.c diff --git a/lib/librte_vhost/virtio_net.c b/drivers/librte_vhost/virtio_net.c similarity index 100% rename from lib/librte_vhost/virtio_net.c rename to drivers/librte_vhost/virtio_net.c diff --git a/lib/librte_vhost/rte_vhost_version.map b/drivers/librte_vhost/rte_vhost_version.map similarity index 100% rename from lib/librte_vhost/rte_vhost_version.map rename to drivers/librte_vhost/rte_vhost_version.map -- 2.14.3