From 84abb1db24cc7d5fd2e8ae16e4cee2e4bd7f39e1 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Wed, 14 Aug 2019 15:32:14 -0700 Subject: [PATCH] lib: move bdev_rpc under lib/bdev Part of a larger series unifying and simplifying the library directory structure. Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/465211 (master) (cherry picked from commit edc8c91a90fdd630450602dea597a1932b41a59e) Change-Id: I2782165aabbea9a31cc466fc7e3bb2b9263142dc Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466974 Reviewed-by: Ben Walker Reviewed-by: Tomasz Zawadzki Tested-by: SPDK CI Jenkins --- lib/bdev/Makefile | 2 +- lib/{event/subsystems => }/bdev/bdev_rpc.c | 0 lib/event/subsystems/bdev/Makefile | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename lib/{event/subsystems => }/bdev/bdev_rpc.c (100%) diff --git a/lib/bdev/Makefile b/lib/bdev/Makefile index 1288bea17b..672e65beb4 100644 --- a/lib/bdev/Makefile +++ b/lib/bdev/Makefile @@ -38,7 +38,7 @@ ifeq ($(CONFIG_VTUNE),y) CFLAGS += -I$(CONFIG_VTUNE_DIR)/include -I$(CONFIG_VTUNE_DIR)/sdk/src/ittnotify endif -C_SRCS = bdev.c part.c scsi_nvme.c +C_SRCS = bdev.c bdev_rpc.c part.c scsi_nvme.c C_SRCS-$(CONFIG_VTUNE) += vtune.c LIBNAME = bdev diff --git a/lib/event/subsystems/bdev/bdev_rpc.c b/lib/bdev/bdev_rpc.c similarity index 100% rename from lib/event/subsystems/bdev/bdev_rpc.c rename to lib/bdev/bdev_rpc.c diff --git a/lib/event/subsystems/bdev/Makefile b/lib/event/subsystems/bdev/Makefile index 1747b75953..58c5141908 100644 --- a/lib/event/subsystems/bdev/Makefile +++ b/lib/event/subsystems/bdev/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -C_SRCS = bdev.c bdev_rpc.c +C_SRCS = bdev.c LIBNAME = event_bdev include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk