From 7b847784d27410a1160d2b580a45cb08372ff43b Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Wed, 12 Jan 2022 09:24:41 +0100 Subject: [PATCH] lib/vhost: rename rte_vhost_compat to rte_vhost_user For some time already the DPDK rte_vhost interface was accomodating for other types of devices than virtio-net. rte_vhost_compat.c file contained the use of DPDK rte_vhost, rather than workarounds. To make that clear it is now renamed to rte_vhost_user.c. This patch is first in series that reworks vhost library with two goals in mind: 1) Refactor vhost and vhost-blk to no longer depend on rte_vhost. All references to that API will be moved to rte_vhost_user.c. 2) Add a transport abstraction for virtio-blk devices. vhost-blk will now be able to expose virtio-blk using multiple implementations of the interface. First one will be vhost_user that depends on DPDK rte_vhost library. Signed-off-by: Tomasz Zawadzki Change-Id: Ib6d4e4a6352069fa76e6b017ec203dab75f887b8 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11052 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris Reviewed-by: Konrad Sztyber --- lib/vhost/Makefile | 2 +- lib/vhost/{rte_vhost_compat.c => rte_vhost_user.c} | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) rename lib/vhost/{rte_vhost_compat.c => rte_vhost_user.c} (99%) diff --git a/lib/vhost/Makefile b/lib/vhost/Makefile index add7acd84..635249086 100644 --- a/lib/vhost/Makefile +++ b/lib/vhost/Makefile @@ -40,7 +40,7 @@ SO_MINOR := 0 CFLAGS += -I. CFLAGS += $(ENV_CFLAGS) -C_SRCS = vhost.c vhost_rpc.c vhost_scsi.c vhost_blk.c rte_vhost_compat.c +C_SRCS = vhost.c vhost_rpc.c vhost_scsi.c vhost_blk.c rte_vhost_user.c LIBNAME = vhost diff --git a/lib/vhost/rte_vhost_compat.c b/lib/vhost/rte_vhost_user.c similarity index 99% rename from lib/vhost/rte_vhost_compat.c rename to lib/vhost/rte_vhost_user.c index 08574cfad..19b2d711f 100644 --- a/lib/vhost/rte_vhost_compat.c +++ b/lib/vhost/rte_vhost_user.c @@ -32,11 +32,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** \file - * Set of workarounds for rte_vhost to make it work with device types - * other than vhost-net. - */ - #include "spdk/stdinc.h" #include "spdk/env.h"