From fd1e204647d7e2676cb442681360b28912c435b4 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Fri, 12 Oct 2018 15:45:57 -0700 Subject: [PATCH] bdev: remove "v" prefix from vbdev library names Let's just make them consistent and all with a bdev_* format. Signed-off-by: Jim Harris Change-Id: Ia3dec7f4be2ecc765b4aa095e6b675f13d326063 Reviewed-on: https://review.gerrithub.io/429289 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Darek Stojaczyk Reviewed-by: Changpeng Liu Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto Reviewed-by: Seth Howell Reviewed-by: Ziye Yang --- lib/bdev/crypto/Makefile | 2 +- lib/bdev/error/Makefile | 2 +- lib/bdev/gpt/Makefile | 2 +- lib/bdev/lvol/Makefile | 2 +- lib/bdev/passthru/Makefile | 2 +- lib/bdev/raid/Makefile | 2 +- lib/bdev/split/Makefile | 2 +- mk/spdk.modules.mk | 10 +++++----- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/bdev/crypto/Makefile b/lib/bdev/crypto/Makefile index c3eb1b741..4f31b667d 100644 --- a/lib/bdev/crypto/Makefile +++ b/lib/bdev/crypto/Makefile @@ -37,6 +37,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk CFLAGS += $(ENV_CFLAGS) C_SRCS = vbdev_crypto.c vbdev_crypto_rpc.c -LIBNAME = vbdev_crypto +LIBNAME = bdev_crypto include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/lib/bdev/error/Makefile b/lib/bdev/error/Makefile index 9dcee8bd7..96c0d7066 100644 --- a/lib/bdev/error/Makefile +++ b/lib/bdev/error/Makefile @@ -35,6 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk C_SRCS = vbdev_error.c vbdev_error_rpc.c -LIBNAME = vbdev_error +LIBNAME = bdev_error include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/lib/bdev/gpt/Makefile b/lib/bdev/gpt/Makefile index 6806c6472..bb75624b3 100644 --- a/lib/bdev/gpt/Makefile +++ b/lib/bdev/gpt/Makefile @@ -35,6 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk C_SRCS = gpt.c vbdev_gpt.c -LIBNAME = vbdev_gpt +LIBNAME = bdev_gpt include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/lib/bdev/lvol/Makefile b/lib/bdev/lvol/Makefile index 569b14cf0..f9692afb1 100644 --- a/lib/bdev/lvol/Makefile +++ b/lib/bdev/lvol/Makefile @@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk C_SRCS = vbdev_lvol.c vbdev_lvol_rpc.c -LIBNAME = vbdev_lvol +LIBNAME = bdev_lvol LOCAL_SYS_LIBS = -luuid include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/lib/bdev/passthru/Makefile b/lib/bdev/passthru/Makefile index 5a2a383a2..7ea24cbef 100644 --- a/lib/bdev/passthru/Makefile +++ b/lib/bdev/passthru/Makefile @@ -37,6 +37,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ C_SRCS = vbdev_passthru.c vbdev_passthru_rpc.c -LIBNAME = vbdev_passthru +LIBNAME = bdev_passthru include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/lib/bdev/raid/Makefile b/lib/bdev/raid/Makefile index 8332399df..fb6ef8d8b 100644 --- a/lib/bdev/raid/Makefile +++ b/lib/bdev/raid/Makefile @@ -36,6 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ C_SRCS = bdev_raid.c bdev_raid_rpc.c -LIBNAME = vbdev_raid +LIBNAME = bdev_raid include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/lib/bdev/split/Makefile b/lib/bdev/split/Makefile index 46edf89a6..f29654678 100644 --- a/lib/bdev/split/Makefile +++ b/lib/bdev/split/Makefile @@ -35,6 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk C_SRCS = vbdev_split.c vbdev_split_rpc.c -LIBNAME = vbdev_split +LIBNAME = bdev_split include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/mk/spdk.modules.mk b/mk/spdk.modules.mk index 77bcca0ad..7a2c634f7 100644 --- a/mk/spdk.modules.mk +++ b/mk/spdk.modules.mk @@ -31,16 +31,16 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -LVOL_MODULES_LIST = vbdev_lvol -# Modules below are added as dependency for vbdev_lvol +LVOL_MODULES_LIST = bdev_lvol +# Modules below are added as dependency for bdev_lvol LVOL_MODULES_LIST += blob blob_bdev lvol BLOCKDEV_MODULES_LIST = $(LVOL_MODULES_LIST) -BLOCKDEV_MODULES_LIST += bdev_malloc bdev_null bdev_nvme nvme vbdev_passthru vbdev_error vbdev_gpt vbdev_split -BLOCKDEV_MODULES_LIST += vbdev_raid +BLOCKDEV_MODULES_LIST += bdev_malloc bdev_null bdev_nvme nvme bdev_passthru bdev_error bdev_gpt bdev_split +BLOCKDEV_MODULES_LIST += bdev_raid ifeq ($(CONFIG_CRYPTO),y) -BLOCKDEV_MODULES_LIST += vbdev_crypto +BLOCKDEV_MODULES_LIST += bdev_crypto endif ifeq ($(CONFIG_RDMA),y)