event: remove subsystem legacy config print

This patch removes callback function for subsystems to
present their options for legacy config.

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I63076fc03eff45da5d57fab03501602922a20e3e
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4749
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>

CHANGELOG.md

@@ -23,6 +23,10 @@ Removed `spdk_bdev_config_text` function for bdev modules to report legacy confi
 A new `spdk_bdev_create_bs_dev_ext` function has been added and `spdk_bdev_create_bs_dev_from_desc`
 function has been deprecated.
 
+### event
+
+Removed `spdk_subsystem_config` callback for submodules as part of legacy config removal.
+
 ### dpdk
 
 Updated DPDK submodule to DPDK 20.08.

include/spdk_internal/event.h

@@ -118,7 +118,6 @@ struct spdk_subsystem {
 	/* User must call spdk_subsystem_init_next() when they are done with their initialization. */
 	void (*init)(void);
 	void (*fini)(void);
-	void (*config)(FILE *fp);
 
 	/**
 	 * Write JSON configuration handler.
@@ -151,7 +150,6 @@ void spdk_subsystem_init(spdk_subsystem_init_fn cb_fn, void *cb_arg);
 void spdk_subsystem_fini(spdk_msg_fn cb_fn, void *cb_arg);
 void spdk_subsystem_init_next(int rc);
 void spdk_subsystem_fini_next(void);
-void spdk_subsystem_config(FILE *fp);
 void spdk_app_json_config_load(const char *json_config_file, const char *rpc_addr,
 			       spdk_subsystem_init_fn cb_fn, void *cb_arg,
 			       bool stop_on_error);

lib/event/Makefile

@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-SO_VER := 5
+SO_VER := 6
 SO_MINOR := 0
 
 LIBNAME = event

lib/event/app.c

@@ -209,7 +209,6 @@ spdk_app_get_running_config(char **config_str, char *name)
 	setvbuf(fp, vbuf, _IOFBF, BUFSIZ);
 
 	app_config_dump_global_section(fp);
-	spdk_subsystem_config(fp);
 
 	length = ftell(fp);
 

lib/event/spdk_event.map

@@ -36,7 +36,6 @@
 	spdk_subsystem_fini;
 	spdk_subsystem_init_next;
 	spdk_subsystem_fini_next;
-	spdk_subsystem_config;
 	spdk_app_json_config_load;
 	spdk_subsystem_config_json;
 	spdk_rpc_initialize;

lib/event/subsystem.c

@@ -265,18 +265,6 @@ spdk_subsystem_fini(spdk_msg_fn cb_fn, void *cb_arg)
 	spdk_subsystem_fini_next();
 }
 
-void
-spdk_subsystem_config(FILE *fp)
-{
-	struct spdk_subsystem *subsystem;
-
-	TAILQ_FOREACH(subsystem, &g_subsystems, tailq) {
-		if (subsystem->config) {
-			subsystem->config(fp);
-		}
-	}
-}
-
 void
 spdk_subsystem_config_json(struct spdk_json_write_ctx *w, struct spdk_subsystem *subsystem)
 {

module/event/subsystems/nbd/nbd.c

@@ -64,7 +64,6 @@ static struct spdk_subsystem g_spdk_subsystem_nbd = {
 	.name = "nbd",
 	.init = nbd_subsystem_init,
 	.fini = nbd_subsystem_fini,
-	.config = NULL,
 	.write_config_json = nbd_subsystem_write_config_json,
 };
 

module/event/subsystems/net/net.c

@@ -58,7 +58,6 @@ static struct spdk_subsystem g_spdk_subsystem_interface = {
 	.name = "interface",
 	.init = interface_subsystem_init,
 	.fini = interface_subsystem_destroy,
-	.config = NULL,
 };
 
 SPDK_SUBSYSTEM_REGISTER(g_spdk_subsystem_interface);

module/event/subsystems/scsi/scsi.c

@@ -58,7 +58,6 @@ static struct spdk_subsystem g_spdk_subsystem_scsi = {
 	.name = "scsi",
 	.init = scsi_subsystem_init,
 	.fini = scsi_subsystem_fini,
-	.config = NULL,
 };
 
 SPDK_SUBSYSTEM_REGISTER(g_spdk_subsystem_scsi);

module/event/subsystems/vhost/vhost.c

@@ -65,7 +65,6 @@ static struct spdk_subsystem g_spdk_subsystem_vhost = {
 	.name = "vhost",
 	.init = vhost_subsystem_init,
 	.fini = vhost_subsystem_fini,
-	.config = NULL,
 	.write_config_json = spdk_vhost_config_json,
 };
 

module/event/subsystems/vmd/vmd.c

@@ -107,7 +107,6 @@ vmd_write_config_json(struct spdk_json_write_ctx *w)
 static struct spdk_subsystem g_spdk_subsystem_vmd = {
 	.name = "vmd",
 	.fini = vmd_subsystem_fini,
-	.config = NULL,
 	.write_config_json = vmd_write_config_json,
 };
 

test/unit/lib/event/subsystem.c/subsystem_ut.c

@@ -54,7 +54,6 @@ set_up_subsystem(struct spdk_subsystem *subsystem, const char *name)
 {
 	subsystem->init = NULL;
 	subsystem->fini = NULL;
-	subsystem->config = NULL;
 	subsystem->name = name;
 }