Commit 37bf49b1 authored Jan 28, 2020 by Evgeniy Kochetov Committed by Tomasz Zawadzki Jul 08, 2020

sock: Add dependency on socket subsystem to other subsystems



Signed-off-by: Evgeniy Kochetov <evgeniik@mellanox.com>
Change-Id: I665760166d54f6156b54735015bd2b586e91c345
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/616


Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>

parent 25696507

mk/spdk.lib_deps.mk

+3 −3

Original line number	Diff line number	Diff line
		@@ -163,12 +163,12 @@ DEPDIRS-event_accel := accel event
		DEPDIRS-event_net := sock net event
		DEPDIRS-event_vmd := vmd conf $(JSON_LIBS) event log thread

		DEPDIRS-event_bdev := bdev event event_accel event_vmd
		DEPDIRS-event_bdev := bdev event event_accel event_vmd event_sock

		DEPDIRS-event_nbd := event nbd event_bdev
		DEPDIRS-event_nvmf := $(BDEV_DEPS_CONF_THREAD) event nvme nvmf event_bdev
		DEPDIRS-event_nvmf := $(BDEV_DEPS_CONF_THREAD) event nvme nvmf event_bdev event_sock
		DEPDIRS-event_scsi := event scsi event_bdev

		DEPDIRS-event_iscsi := event iscsi event_scsi
		DEPDIRS-event_iscsi := event iscsi event_scsi event_sock
		DEPDIRS-event_vhost := event vhost event_scsi
		DEPDIRS-event_sock := event

module/event/subsystems/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ DIRS-$(CONFIG_VHOST) += vhost
		# the subsystem dependency tree defined within the event subsystem C files
		# themselves. Should that tree change, these dependencies should change
		# accordingly.
		DEPDIRS-bdev := accel vmd
		DEPDIRS-bdev := accel vmd sock
		DEPDIRS-iscsi := scsi
		DEPDIRS-nbd := bdev
		DEPDIRS-nvmf := bdev

module/event/subsystems/bdev/bdev.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -81,3 +81,4 @@ static struct spdk_subsystem g_spdk_subsystem_bdev = {
		SPDK_SUBSYSTEM_REGISTER(g_spdk_subsystem_bdev);
		SPDK_SUBSYSTEM_DEPEND(bdev, accel)
		SPDK_SUBSYSTEM_DEPEND(bdev, vmd)
		SPDK_SUBSYSTEM_DEPEND(bdev, sock)

module/event/subsystems/iscsi/iscsi.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -77,3 +77,4 @@ static struct spdk_subsystem g_spdk_subsystem_iscsi = {

		SPDK_SUBSYSTEM_REGISTER(g_spdk_subsystem_iscsi);
		SPDK_SUBSYSTEM_DEPEND(iscsi, scsi)
		SPDK_SUBSYSTEM_DEPEND(iscsi, sock)

module/event/subsystems/nvmf/nvmf_tgt.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -473,3 +473,4 @@ static struct spdk_subsystem g_spdk_subsystem_nvmf = {

		SPDK_SUBSYSTEM_REGISTER(g_spdk_subsystem_nvmf)
		SPDK_SUBSYSTEM_DEPEND(nvmf, bdev)
		SPDK_SUBSYSTEM_DEPEND(nvmf, sock)