diff --git a/app/iscsi_tgt/Makefile b/app/iscsi_tgt/Makefile index 24af5bb9a..6b695d91a 100644 --- a/app/iscsi_tgt/Makefile +++ b/app/iscsi_tgt/Makefile @@ -44,7 +44,7 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/lib C_SRCS := iscsi_tgt.c SPDK_LIB_LIST = $(ALL_MODULES_LIST) -SPDK_LIB_LIST += event_bdev event_accel event_iscsi event_net event_scsi event_vmd event +SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) event_iscsi event_net event_scsi event SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev iscsi scsi accel trace conf SPDK_LIB_LIST += thread util log log_rpc app_rpc net sock notify diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile index eed24a55c..0a7796d41 100644 --- a/app/nvmf_tgt/Makefile +++ b/app/nvmf_tgt/Makefile @@ -40,7 +40,7 @@ APP = nvmf_tgt C_SRCS := nvmf_main.c SPDK_LIB_LIST = $(ALL_MODULES_LIST) -SPDK_LIB_LIST += event_bdev event_accel event_nvmf event_net event_vmd +SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) event_nvmf event_net SPDK_LIB_LIST += nvmf event log trace conf thread util bdev accel rpc jsonrpc json net sock SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc notify diff --git a/app/spdk_tgt/Makefile b/app/spdk_tgt/Makefile index 4f6eef013..43583f855 100644 --- a/app/spdk_tgt/Makefile +++ b/app/spdk_tgt/Makefile @@ -50,7 +50,7 @@ endif endif endif -SPDK_LIB_LIST += event_bdev event_accel event_iscsi event_net event_scsi event_nvmf event_vmd event +SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) event_iscsi event_net event_scsi event_nvmf event SPDK_LIB_LIST += nvmf trace log conf thread util bdev iscsi scsi accel rpc jsonrpc json SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc net sock notify diff --git a/app/vhost/Makefile b/app/vhost/Makefile index 2106a23d3..4bb28b20e 100644 --- a/app/vhost/Makefile +++ b/app/vhost/Makefile @@ -46,7 +46,7 @@ ifeq ($(CONFIG_VHOST_INTERNAL_LIB),y) SPDK_LIB_LIST += rte_vhost endif -SPDK_LIB_LIST += event_bdev event_accel event_net event_scsi event_vmd event +SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) event_net event_scsi event SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev scsi accel trace conf SPDK_LIB_LIST += thread util log log_rpc app_rpc SPDK_LIB_LIST += event_nbd nbd net sock notify diff --git a/examples/bdev/fio_plugin/Makefile b/examples/bdev/fio_plugin/Makefile index d43221402..e50498d24 100644 --- a/examples/bdev/fio_plugin/Makefile +++ b/examples/bdev/fio_plugin/Makefile @@ -43,6 +43,6 @@ C_SRCS = fio_plugin.c # Unable to combine the FIO plugin and the VPP socket abstraction (license incompatibility) SPDK_LIB_LIST = $(filter-out sock_vpp,$(ALL_MODULES_LIST)) SPDK_LIB_LIST += thread util bdev bdev_rpc conf accel rpc jsonrpc json log sock trace notify -SPDK_LIB_LIST += event event_bdev event_accel event_vmd +SPDK_LIB_LIST += event $(EVENT_BDEV_SUBSYSTEM) include $(SPDK_ROOT_DIR)/mk/spdk.fio.mk diff --git a/examples/bdev/hello_world/Makefile b/examples/bdev/hello_world/Makefile index dc26f45ed..f4a5a5b69 100644 --- a/examples/bdev/hello_world/Makefile +++ b/examples/bdev/hello_world/Makefile @@ -38,7 +38,7 @@ APP = hello_bdev C_SRCS := hello_bdev.c SPDK_LIB_LIST = $(ALL_MODULES_LIST) -SPDK_LIB_LIST += event_bdev event_accel event_vmd +SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) SPDK_LIB_LIST += bdev_rpc bdev accel event thread util conf trace log jsonrpc json rpc sock notify include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/examples/blob/cli/Makefile b/examples/blob/cli/Makefile index 5f1ff09b5..3c3ff1f26 100644 --- a/examples/blob/cli/Makefile +++ b/examples/blob/cli/Makefile @@ -39,7 +39,7 @@ C_SRCS := blobcli.c # Don't link bdev_lvol in blobcli - otherwise this utility cannot operate on an lvolstore SPDK_LIB_LIST = $(filter-out bdev_lvol,$(ALL_MODULES_LIST)) -SPDK_LIB_LIST += event_bdev event_accel event_vmd +SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) SPDK_LIB_LIST += bdev accel event thread util conf trace \ log jsonrpc json rpc sock notify diff --git a/examples/blob/hello_world/Makefile b/examples/blob/hello_world/Makefile index b0534420b..0b5e89396 100644 --- a/examples/blob/hello_world/Makefile +++ b/examples/blob/hello_world/Makefile @@ -38,7 +38,7 @@ APP = hello_blob C_SRCS := hello_blob.c SPDK_LIB_LIST = $(ALL_MODULES_LIST) -SPDK_LIB_LIST += event_bdev event_accel event_vmd +SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) SPDK_LIB_LIST += bdev accel event thread util conf trace \ log jsonrpc json rpc sock notify diff --git a/examples/nvmf/nvmf/Makefile b/examples/nvmf/nvmf/Makefile index a2574bde2..ccf5273be 100644 --- a/examples/nvmf/nvmf/Makefile +++ b/examples/nvmf/nvmf/Makefile @@ -40,7 +40,7 @@ APP := nvmf C_SRCS := nvmf.c SPDK_LIB_LIST = $(ALL_MODULES_LIST) SPDK_LIB_LIST += nvmf thread util bdev conf accel rpc jsonrpc json log sock trace notify -SPDK_LIB_LIST += event event_bdev event_accel event_vmd +SPDK_LIB_LIST += event $(EVENT_BDEV_SUBSYSTEM) ifeq ($(CONFIG_FC),y) ifneq ($(strip $(CONFIG_FC_PATH)),) diff --git a/lib/rocksdb/spdk.rocksdb.mk b/lib/rocksdb/spdk.rocksdb.mk index c026a602e..78ffef257 100644 --- a/lib/rocksdb/spdk.rocksdb.mk +++ b/lib/rocksdb/spdk.rocksdb.mk @@ -54,7 +54,7 @@ CXXFLAGS += -fno-sanitize=address endif SPDK_LIB_LIST = $(ALL_MODULES_LIST) -SPDK_LIB_LIST += event_bdev event_accel event_vmd +SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) SPDK_LIB_LIST += bdev accel event util conf trace log jsonrpc json rpc sock thread notify AM_LINK += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) diff --git a/mk/spdk.modules.mk b/mk/spdk.modules.mk index c4e373743..d0238d2fc 100644 --- a/mk/spdk.modules.mk +++ b/mk/spdk.modules.mk @@ -114,4 +114,6 @@ ifeq ($(CONFIG_IDXD),y) ACCEL_MODULES_LIST += accel_idxd idxd endif +EVENT_BDEV_SUBSYSTEM = event_bdev event_accel event_vmd + ALL_MODULES_LIST = $(BLOCKDEV_MODULES_LIST) $(ACCEL_MODULES_LIST) $(SOCK_MODULES_LIST) diff --git a/test/app/bdev_svc/Makefile b/test/app/bdev_svc/Makefile index 4e6ce2111..1736d57f0 100644 --- a/test/app/bdev_svc/Makefile +++ b/test/app/bdev_svc/Makefile @@ -40,7 +40,7 @@ APP = bdev_svc C_SRCS := bdev_svc.c SPDK_LIB_LIST = $(ALL_MODULES_LIST) -SPDK_LIB_LIST += event_bdev event_accel event_vmd +SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) SPDK_LIB_LIST += nvmf event log trace conf thread util bdev accel rpc jsonrpc json sock blobfs_bdev SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc notify diff --git a/test/bdev/bdevio/Makefile b/test/bdev/bdevio/Makefile index 660315de7..83aca58ca 100644 --- a/test/bdev/bdevio/Makefile +++ b/test/bdev/bdevio/Makefile @@ -40,7 +40,7 @@ APP = bdevio C_SRCS := bdevio.c SPDK_LIB_LIST = $(ALL_MODULES_LIST) -SPDK_LIB_LIST += event_bdev event_accel event_vmd +SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) SPDK_LIB_LIST += app_rpc bdev bdev_rpc accel event trace log conf thread util rpc jsonrpc json sock notify LIBS += -lcunit diff --git a/test/bdev/bdevperf/Makefile b/test/bdev/bdevperf/Makefile index 730d081c3..3ff01f94a 100644 --- a/test/bdev/bdevperf/Makefile +++ b/test/bdev/bdevperf/Makefile @@ -40,7 +40,7 @@ APP = bdevperf C_SRCS := bdevperf.c SPDK_LIB_LIST = $(ALL_MODULES_LIST) -SPDK_LIB_LIST += event_bdev event_accel event_vmd +SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) SPDK_LIB_LIST += bdev accel event trace log conf thread util sock notify SPDK_LIB_LIST += rpc jsonrpc json app_rpc log_rpc bdev_rpc diff --git a/test/blobfs/fuse/Makefile b/test/blobfs/fuse/Makefile index 75f19cf88..09d956e4f 100644 --- a/test/blobfs/fuse/Makefile +++ b/test/blobfs/fuse/Makefile @@ -40,7 +40,7 @@ APP = fuse C_SRCS := fuse.c SPDK_LIB_LIST = $(ALL_MODULES_LIST) -SPDK_LIB_LIST += event_bdev event_accel event_vmd +SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) SPDK_LIB_LIST += bdev accel event thread util conf trace \ log jsonrpc json rpc sock notify blobfs_bdev diff --git a/test/blobfs/mkfs/Makefile b/test/blobfs/mkfs/Makefile index 51d8af5d4..42eebd9f1 100644 --- a/test/blobfs/mkfs/Makefile +++ b/test/blobfs/mkfs/Makefile @@ -40,7 +40,7 @@ APP = mkfs C_SRCS := mkfs.c SPDK_LIB_LIST = $(ALL_MODULES_LIST) -SPDK_LIB_LIST += event_bdev event_accel event_vmd +SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) SPDK_LIB_LIST += bdev accel event thread util conf trace \ log jsonrpc json rpc sock notify blobfs_bdev