Commit e50ade31 authored by Changpeng Liu's avatar Changpeng Liu Committed by Tomasz Zawadzki
Browse files

vfio_user: remove CONFIG_VFIO_USER flag for client library 



The client vfio_user library doesn't require this flag as
it is totally owned in SPDK, so remove it.

Change-Id: I8f7b1df18017ceac24dbb8a0417871f25f6bee0d
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13895


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 5004d7b8

configure

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ function usage() { 
	echo " --without-vhost           No path required."

	echo " --with-virtio             Build vhost initiator and virtio-pci bdev modules."

	echo " --without-virtio          No path required."

	echo " --with-vfio-user[=DIR]    Build custom vfio-user transport for NVMf target and NVMe initiator."

	echo " --with-vfio-user[=DIR]    Build custom vfio-user transport for NVMf target and vfio-user target."

	echo "                           vfio-user initiator is always built-in in Linux."

	echo " --without-vfio-user       example: /usr/src/libvfio-user"

	echo " --with-pmdk[=DIR]         Build persistent memory bdev.

					 example: /usr/share/pmdk"

lib/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ DIRS-y += bdev blob blobfs conf dma accel event json jsonrpc \ 
          log lvol rpc sock thread trace util nvme vmd nvmf scsi \

          ioat ut_mock iscsi notify init trace_parser

ifeq ($(OS),Linux)

DIRS-y += nbd ftl

DIRS-y += nbd ftl vfio_user

endif



DIRS-$(CONFIG_OCF) += env_ocf
@@ -20,7 +20,7 @@ DIRS-$(CONFIG_VHOST) += vhost 
DIRS-$(CONFIG_VIRTIO) += virtio

DIRS-$(CONFIG_REDUCE) += reduce

DIRS-$(CONFIG_RDMA) += rdma

DIRS-$(CONFIG_VFIO_USER) += vfio_user vfu_tgt

DIRS-$(CONFIG_VFIO_USER) += vfu_tgt



# If CONFIG_ENV is pointing at a directory in lib, build it.

# Out-of-tree env implementations must be built separately by the user.

lib/nvme/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ C_SRCS = nvme_ctrlr_cmd.c nvme_ctrlr.c nvme_fabric.c nvme_ns_cmd.c \ 
	nvme_quirks.c nvme_transport.c nvme_discovery.c \

	nvme_ctrlr_ocssd_cmd.c nvme_ns_ocssd_cmd.c nvme_tcp.c \

	nvme_opal.c nvme_io_msg.c nvme_poll_group.c nvme_zns.c

C_SRCS-$(CONFIG_VFIO_USER) += nvme_vfio_user.c

ifeq ($(OS),Linux)

C_SRCS += nvme_vfio_user.c

endif

C_SRCS-$(CONFIG_RDMA) += nvme_rdma.c

C_SRCS-$(CONFIG_NVME_CUSE) += nvme_cuse.c

mk/spdk.lib_deps.mk

+6 −4
Original line number Diff line number Diff line
@@ -25,8 +25,10 @@ DEPDIRS-util := log 
DEPDIRS-vmd := log util

DEPDIRS-dma := log

DEPDIRS-trace_parser := log

ifeq ($(CONFIG_VFIO_USER),y)

ifeq ($(OS),Linux)

DEPDIRS-vfio_user := log

endif

ifeq ($(CONFIG_VFIO_USER),y)

DEPDIRS-vfu_tgt := log util thread $(JSON_LIBS)

endif
@@ -37,12 +39,12 @@ DEPDIRS-reduce := log util 
DEPDIRS-thread := log util trace



DEPDIRS-nvme := log sock util trace

ifeq ($(OS),Linux)

DEPDIRS-nvme += vfio_user

endif

ifeq ($(CONFIG_RDMA),y)

DEPDIRS-nvme += rdma dma

endif

ifeq ($(CONFIG_VFIO_USER),y)

DEPDIRS-nvme += vfio_user

endif



DEPDIRS-blob := log util thread dma

DEPDIRS-accel := log util thread json rpc jsonrpc